cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-17 21:53:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,557 Commits 9 Branches 0 Tags
978384871706cb471192fdd982b51a8da2cad0c0
Commit Graph

13989 Commits

Author SHA1 Message Date
Daranz
baf49d0c23 Tweak CallTechName() 2016-03-31 16:11:13 -04:00
Daranz
2482ddf55a Resolve problem with robot destructive analyzer 
CallTechName() was borrowed from destructive_analyzer.dm for reuse in
the portable analyzer.

Resolves #12356
 2016-03-31 16:10:07 -04:00
Kelenius
6d76aa3966 Fixes #945 - monkeys can't ventcrawl 
Ventcrawl will now tell you which items prevent you from crawling if it
fails due to that
 2016-03-31 18:12:30 +03:00
Neerti
c06415c436 Merge pull request #1299 from EmperorJon/30_Mar._NanoMap_Stuff 
Updates NanoUI map.
 2016-03-30 14:24:09 -04:00
Hubblenaut
3a45ceee64 Full fertilizer bottles of type glass/bottle 2016-03-30 19:42:13 +02:00
PsiOmegaDelta
b277447426 Now possible to tweak colors of loadout items. 
Used to greatly cut down on the number of hats (hijabs, kippots, and turbans).
 2016-03-30 18:01:09 +01:00
PsiOmegaDelta
877e3d66df Makes loadout datums more flexible. 
Loadout item definitions can now also take a list of tweaks, which will adjust the item after spawn.
Currently includes color and icon state changes.
 2016-03-30 16:46:14 +01:00
EmperorJon
5e05d6b91a Merge pull request #1293 from Yoshax/progressbars 
Adds progress bars to tasks that take time
 2016-03-30 15:15:00 +01:00
EmperorJon
2bb4f43166 Merge pull request #1237 from Hubblenaut/grabpull 
Removes people being able to pull from somebody's grab
 2016-03-30 15:07:25 +01:00
Jon
3c85fe3e65 Updates NanoUI map. 
Also should update the necessary files so you don't need to alter nanomapgen.dm to fit our map.
I don't know why I didn't just commit this the first time. Call me dumb.
 2016-03-30 15:02:42 +01:00
Neerti
75c0c5cc38 Changes lots of gun stuff, see PR for details. 2016-03-30 03:41:54 -04:00
Neerti
015c6ef58a Merge pull request #1284 from Mark9013100/3/29/2016mapfixes 
Map fixes, minor edits
 2016-03-30 02:25:35 -04:00
Neerti
e7c9681c91 Merge pull request #1281 from redstryker/Navy-Blue-Scrubs 
Adds Navy Blue scrubs
 2016-03-30 02:24:07 -04:00
Neerti
a9b2e7a61e Merge pull request #1133 from Kelenius/coolBots 
Overhauls bot AI
 2016-03-30 02:23:28 -04:00
Yoshax
9b7b8656ba Merge remote-tracking branch 'upstream/master' into progressbars 2016-03-30 00:31:03 +01:00
Yoshax
5b225ba765 Fixes subtype 2016-03-30 00:28:38 +01:00
PsiOmegaDelta
84799befca Can now toggle the progress bar visibility. 
Enabled  by default.
 2016-03-30 00:13:41 +01:00
EmperorJon
547b4994da Merge pull request #1292 from Yoshax/saltfix 
Fixes Deadchat
 2016-03-30 00:03:41 +01:00
Yoshax
c1e69fd8a3 Adds a missing ! 2016-03-29 23:55:27 +01:00
EmperorJon
b513e4be92 Merge pull request #1288 from Mark9013100/3/29/2016riothelmedit 
Minor change to riot helm code
 2016-03-29 23:53:33 +01:00
Datraen
3809e92adf Merge pull request #1214 from Yoshax/morepreferences 
Makes it possible to have more than 16 preferences
 2016-03-29 14:44:47 -04:00
Mark9013100
a7b6bf1960 Minor improvement to riot helm code 2016-03-29 12:43:07 -04:00
Mark9013100
50a6f53c12 Map fixes, minor edits 2016-03-29 10:50:22 -04:00
Kelenius
c8b510b415 Adds unit tests 
Port of https://github.com/Baystation12/Baystation12/pull/11808 and
several others
Fixes three overlapping cables ([192 / 158 / 1], [214 / 161 / 1], [122 /
197 / 1])
Fixes drill and mech drill having the same ID.
 2016-03-29 17:42:22 +03:00
Datraen
f2e9601400 Fixes a check to blind if there is a lack of eyes. Broken eyes are already handled in their process. 2016-03-29 00:36:38 -04:00
redstryker
7a437e12f5 Adds Navy Blue scrubs and a navy blue surgical cap. Also adds them to the loadout and all appropriate lockers. 2016-03-28 23:53:38 -04:00
Neerti
8bfac9c57a Merge pull request #1206 from Hubblenaut/master 
Adds wallets to loadout menu
 2016-03-28 12:49:57 -04:00
Yoshax
db1a5021bc Corrects error in a span ckass 2016-03-28 17:19:03 +01:00
Mark9013100
f95cbbdc4a Ports /tg/'s armored trenchcoat sprite 2016-03-27 07:06:01 -04:00
Neerti
ddf4cceb96 Merge pull request #1260 from Datraen/BuckleResistFix 
Fixes buckling preventing NanoUI interactions, resist unbuckling and uncuffing at the same time.
 2016-03-26 20:51:08 -04:00
Yoshax
d0d3d3cb16 Merge remote-tracking branch 'upstream/master' into morepreferences 2016-03-27 00:17:24 +00:00
Datraen
f8825f1752 Fixes buckling preventing NanoUI interactions, resist unbuckling and uncuffing at the same time. 2016-03-26 18:33:46 -04:00
Neerti
36096643fc Merge pull request #1244 from Mark9013100/3/24/2016combatjumpsuit 
Adds sprites for the combat turtleneck
 2016-03-26 17:02:21 -04:00
Neerti
13b255f43c Merge pull request #1259 from Datraen/BayLifePick 
Baystation12 Life Improvement Port
 2016-03-26 17:01:55 -04:00
Datraen
ca2e45cc3e Resolves conflicts with Baystation12/Baystation12#12276 2016-03-26 16:35:31 -04:00
Neerti
96e52f5af0 Merge pull request #1229 from SinTwo/construction_update 
Construction update
 2016-03-26 15:45:19 -04:00
Neerti
57b6fe7aa8 Merge pull request #1169 from Kelenius/fixesOnly 
Axes old wire, fixes costs in lathe
 2016-03-26 15:42:25 -04:00
Chinsky
98750f20ba Removed some duplicated code for clearer readability. 
Fixed cold air giving high temperature traces.
 2016-03-26 15:41:27 -04:00
Chinsky
96fd04374a Makes unused code use jitterness proc. 
Fixes life assuming that if we don't have eyes, we never had em.
 2016-03-26 15:41:25 -04:00
Chinsky
87395fd6c2 Shortens some wordy procs that used a lot of duplicate code with power of OOP 2016-03-26 15:40:36 -04:00
Neerti
655a7b08e2 Merge pull request #1258 from Datraen/PDAManifestFix 
Removes JSON encoding of PDA Manifest list.
 2016-03-26 15:38:32 -04:00
Neerti
30dadef6e9 Merge pull request #1255 from Anewbe/patch-1 
Leg Guard fixes
 2016-03-26 15:37:34 -04:00
Datraen
c09bb6d807 Removes JSON encoding of PDA Manifest list. 2016-03-26 15:31:08 -04:00
Datraen
357fd67a65 Merge pull request #1159 from Kelenius/playingWithTravis 
Attempts to port bay's travis update attempts
 2016-03-26 13:18:55 -04:00
Anewbe
d4f7a366d8 Leg Guard fixes 
- Unathi and Taj should now be able to wear the leg armors
- The specialized leg armors should now have the appropriate armor values, rather than all sharing the one for laserproof
 2016-03-25 22:14:41 -05:00
SinTwo
f0487bc6b4 Reagent Dispenser Update 2016-03-25 16:59:07 -04:00
SinTwo
b356f5cf21 Construction Update 2016-03-25 16:02:36 -04:00
Mark9013100
03d1fbcf10 Gives the QM a proper stamp 2016-03-24 14:52:55 -04:00
Neerti
faf538a832 Merge pull request #1246 from Datraen/XenoarchSpawnFix 
Fixes a check in xenoarch master controller.
 2016-03-24 12:17:07 -04:00
Datraen
4c9c5e5870 Fixes a check in xenoarch master controller. 2016-03-24 10:17:26 -04:00