cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-09-01 00:16:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
31,097 Commits 66 Branches 25 Tags
54594de2dba2b185ac88826beb20d4ba6124953e
Commit Graph
23222 Commits
Author SHA1 Message Date
Spades e0748c8261 Response to feedback. 
Tried to make descriptions better.
SAW magazine no longer fits in pockets.
 2016-06-03 01:57:13 -04:00
Broseph Stylin 97a94af41a Fixes mapped-in double beds being made of steel and lacking padding. 2016-06-03 02:36:27 -03:00
Leshana e3c8dd18e3 Fixes a bad material discovered by the new unit test! 
* "mutagen" is a reagent, not a material; it goes in the chemicals list.
 2016-06-02 18:37:37 -04:00
Leshana d002e5a3e7 Add a unit test which verifies all research designs' materials lists and chemicals lists contain only valid materials and reagents. 2016-06-02 18:37:37 -04:00
Yoshax 574f96639a Merge pull request #1860 from Datraen/XenobioUpdate5 
Xenobio Update #5
 2016-06-02 23:32:42 +01:00
Datraen fbb0f764d2 Adds a missing (src) 2016-06-02 18:12:21 -04:00
Datraen 05caade93e Ensures slimes will have identically different trait datums when the cores are created. 
This does not account for VV modifications.
 2016-06-02 18:09:27 -04:00
Datraen c5b2a6f708 Brings SmartFridges under the vending machine datum system, with tweaks. 2016-06-02 17:46:58 -04:00
Spades 0d5b943db7 Github client being stupid. Changed these names too. 2016-06-02 17:19:57 -04:00
Spades c6b650afa5 Changed some new gun names based on feedback. 
People prefer fantasy names for modern guns! Left names like the Mosin
and Tommygun because they're too ironic to change, even in the 26th
century.
 2016-06-02 17:16:21 -04:00
Datraen e62b06e867 Merge pull request #1856 from SinTwo/frame_fix 
Fixes fax runtimes at startup.
 2016-06-02 15:19:01 -04:00
SinTwo 1b80af361e Fixes fax runtimes at startup. 2016-06-02 15:10:33 -04:00
Neerti b160f369ea Merge pull request #1855 from Datraen/SparkQdel 
Gives sparks a chance to qdel.
 2016-06-02 14:51:57 -04:00
Datraen be4a51eae8 Puts the qdel in initialize. 2016-06-02 14:36:53 -04:00
Spades 093ab24339 Few quick fixes 
- Fixes shotgun magazine icon.
- SAW uses correct sound.
- Shotgun revolver uses correct sound.
- Mosin has a back sprite now. Placeholder.
 2016-06-02 14:32:37 -04:00
Datraen 804d69e965 Gives sparks a chance to qdel. 2016-06-02 14:31:20 -04:00
Yoshax 1980d2c741 Merge pull request #1853 from Datraen/XenobioUpdate4 
Xenobio2 Update #4
 2016-06-02 19:25:04 +01:00
Arokha Sieyes 63bf71e393 Sanitizing text twice breaks quotes 
Someone didn't read the comment in text.dm helpers, I see. This text is sanitized 2 lines above. Don't do it twice, nothing changed.

Fixes https://github.com/VOREStation/VOREStation/issues/276

(Do cross-repo magic-word closes work? _We're about to find out!_)
 2016-06-02 14:12:48 -04:00
Spades 736c8c132c Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into GunsGunsGuns 2016-06-02 13:01:45 -04:00
Datraen e6a90dbe6b Tweaks scanner, trait acquisiton for slimes, trait application for all xenos. 2016-06-02 12:34:31 -04:00
Neerti a95b47174e Merge pull request #1851 from Yoshax/bugfixes 
Adjusts the checks to ensure you cannot buckle two people to the same thing
 2016-06-02 10:36:25 -04:00
Spades dc140204fe Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into GunsGunsGuns 2016-06-02 10:28:14 -04:00
Yoshax 4d3afc42b6 Adjusts the checks to ensure you cannot buckle two people to the same thing 2016-06-02 15:04:40 +01:00
EmperorJon 241c4714e9 Merge pull request #1847 from SinTwo/frame_fix 
Removal of /map/New()
 2016-06-02 02:10:39 +01:00
SinTwo 8edec2a5d1 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into frame_fix 2016-06-01 17:53:51 -04:00
Yoshax f75d509e7f Ports event system from Bay 2016-06-01 22:05:04 +01:00
Datraen 2c95126a00 Merge pull request #1765 from Yoshax/cocainecocaine 
Fixes snow and adjusts a definition
 2016-06-01 15:57:15 -04:00
Spades a54e49fa73 Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into GunsGunsGuns 2016-06-01 15:16:53 -04:00
SinTwo 2d7d011d9e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into frame_fix 
Conflicts:
	maps/polaris-1.dmm
	maps/polaris-5.dmm
 2016-06-01 14:47:21 -04:00
SinTwo 5d25d72593 Frame Fixes 2016-06-01 14:32:56 -04:00
Datraen a7abdb5c86 Merge pull request #1845 from Yoshax/preperationsforbigports 
Scheduler now uses btime, and other improvements
 2016-06-01 14:21:28 -04:00
Yoshax 927923f1bd Merge pull request #1846 from VOREStation/battfix 
Readds power cells to exosuit fabs.
 2016-06-01 18:36:23 +01:00
Arokha Sieyes 80706b8e90 Readds power cells to exosuit fabs. 2016-06-01 13:25:32 -04:00
Spades a6f846c41a Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into GunsGunsGuns 2016-06-01 13:00:41 -04:00
Yoshax 0fb98bbabd Scheduler now uses btime, and other improvements 2016-06-01 17:56:07 +01:00
Spades ff87150c3d Let's just have the one commit this time because I'm no longer paranoid of losing progress. 2016-06-01 12:48:48 -04:00
Yoshax 0fac31fad3 Fixes being able to buckle more than one mob to bucklable things 2016-06-01 16:34:07 +01:00
Yoshax d32a708ec7 Fixes snowy overlays layering 2016-06-01 16:01:36 +01:00
Neerti 6245cbaf07 Merge pull request #1836 from Yoshax/grenadefix 
Fixes box of EMP grenades only ever spawning 1 grenade
 2016-06-01 00:39:10 -04:00
Neerti 3e3962c0a9 Merge pull request #1801 from Anewbe/more_hostile_mobs 
PUNCH SPIDERS, GET MONEY
 2016-06-01 00:37:46 -04:00
Yoshax 0777379d37 Fixes box of EMP grenades only ever spawning 1 grenade 2016-06-01 02:00:57 +01:00
Yoshax efe66153ab Merge branch 'master' of https://github.com/PolarisSS13/Polaris into dnalockframework 
# Conflicts:
#	code/modules/projectiles/gun.dm
 2016-06-01 00:47:52 +01:00
Arokha Sieyes f23035c9ed Make Exosuit Fabs Great Again 
S'what I get for copypasting suggestions I guess.
 2016-05-31 18:45:08 -04:00
Mechoid 7bcd041e09 Fixes overlay issue with ghosts when choosing sprites, and adds more sprites to choose from from popular demand. 2016-05-31 14:30:17 -07:00
Datraen 36d9cee0f7 Merge pull request #1806 from VOREStation/limbprinter 
Make FBPs Constructable
 2016-05-31 15:50:32 -04:00
Arokha Sieyes 76e4afa6d7 Fix suggested by Ginja 2016-05-31 15:38:24 -04:00
DatraenandYoshax c75512aa75 Xenobio2 Update #3 (#1832) 
* Adds growth inspection to the trait scanner, lowers mutation and growth levels.

* Adds NutriMaxes to Xenobiology, for feeding the slimes.

* Fixes a typo
 2016-05-31 18:30:52 +01:00
Broseph StylinandYoshax 4518e22be2 Small update to double beds. (#1828) 
* Corrects a typo because I'm dumb.

* Adds double bed recipe to appropriate materials.
 2016-05-31 15:08:57 +01:00
DatraenandYoshax caac4c5838 Randomized Plant Update (#1805) 
* Plants now use a ban list instead of an approved.

This means that most reagents can be synthesized by plants.

Also added a name generator for strange seeds, based off of a bit of
lipsum and a bit of various plant genus and descriptors.

# Conflicts:
#	code/modules/hydroponics/seed.dm

* Removes # sign
 2016-05-31 15:08:42 +01:00
Mark9013100 d7624b2b15 Adds a few more accessories 2016-05-31 06:16:05 -04:00