cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,829 Commits 5 Branches 0 Tags
96e52f5af00a4ccac8dce66c8eda6d867564b321
Commit Graph

22266 Commits

Author SHA1 Message Date
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
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
Neerti
35b1de1460 Merge pull request #1254 from SparklySheep/patch-1 
Gives the Roboticist a full toolbelt on roundstart.
 2016-03-26 15:36:41 -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
SparklySheep
ad5e67783e Gives the Roboticist a full toolbelt on roundstart. 
It's annoying to load up a toolbelt every roundstart as a roboticist. This is a quality of life change so the roboticist can get to doing robotics stuff instead of filling up the toolbelt every round start.
 2016-03-25 22:02:08 -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
Yoshax
288be19de4 Changes some antag items to not have 'suspicious' in their name 2016-03-25 19:28:49 +00: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
Neerti
dfb6ea7071 Merge pull request #1241 from Mark9013100/3/23/2016magstorage 
Armor can now hold maglights
 2016-03-24 09:06:51 -04:00
Neerti
b457b54b02 Merge pull request #1234 from Yoshax/IB 
Fixes IB surgery not checking for open ribs etc
 2016-03-23 20:42:48 -04:00
Neerti
3e45f9f727 Merge pull request #1235 from Yoshax/watercooler 
Watercooler can be wrenched/unwrenched now
 2016-03-23 20:28:12 -04:00
Mark9013100
5f734effbc Armor can now hold maglights 2016-03-23 20:14:56 -04:00
Mark9013100
ce1e4bc33b Capitalizes pill description. 2016-03-23 16:09:21 -04:00
Kelenius
e883863f4b Merge branch 'master' into playingWithTravis 2016-03-23 17:12:11 +03:00
Yoshax
eb085f1160 Adjusts lightswitch light cost 2016-03-23 13:43:34 +00:00
Atlantis
3e0c5f2e49 Light switches now glow 
- Adds a relatively weak light to light switches (slightly weaker than a light bulb), so it is not that hard to find them when the room is dark. Colour can be red or green depending on whether the light switch is turned on or off.
- Increases light switch power usage to 20 Watts. For comparsion, a light bulb has 60 so it feels apropriate.
- Light switches now run off LIGHT APC channel rather than EQUIP.
- Updated: Light switches now layer above darkness when powered. Light intensity slightly reduced.
 2016-03-23 13:23:10 +00:00
Brian Cook
9edc1dd549 Watercooler can be wrenched/unwrenched now 
Fixed capitalization in some cases
 2016-03-23 13:13:54 +00:00
Chinsky
2ad91fc60c Fixes IB surgery not checking for open ribs etc 
Guess it wasn't updated after Zuh's encased changes
 2016-03-23 13:08:08 +00:00
Mark9013100
e62863e1b3 Renames the security .45 2016-03-22 23:03:21 -04:00
Neerti
a9ad84da4b Merge pull request #1191 from Kelenius/inventoryCleanup 
Mob inventory cleanup
 2016-03-22 21:42:27 -04:00
Neerti
9027b0f391 Merge pull request #1221 from Ithalan/master 
Fixes Anomaly Analyzer reading the wrong variable for the artifact effect's range
 2016-03-22 21:36:42 -04:00
Neerti
0891eba8cd Merge pull request #1207 from Datraen/GTStationWide 
Adds a check to the greytide virus to see if the APCs are operating.
 2016-03-22 21:36:35 -04:00
Neerti
6c1187d3f7 Merge pull request #1228 from Yoshax/resomiblood 
Make human vessels properly adjust capacity on species change
 2016-03-22 21:33:24 -04:00
Yoshax
c7dd36a297 Make human vessels properly adjust capacity on species change 2016-03-22 22:45:39 +00:00
EmperorJon
aea690febf Merge pull request #1222 from Datraen/XenoarchSpawnFix 
[XENOARCH] Checks to see if the turf is a floor before spawning artifacts.
 2016-03-22 22:34:52 +00:00
Datraen
fbbfb78dec Merge pull request #1212 from Kelenius/feedMeLight 
Fixes #1171 - ninja suit injects nutriment
 2016-03-22 15:15:14 -04:00
Matt
61d2eb1d3e Properly log dropper-related assault for admins 
Fixes bug #1219

Moving the logging from post-dropping (when the dropper is empty) to Pre-drop, post-dropable check (it should not be located at the point when a drop is going to occur, but just prior to actually doing so).

As always, please review this change to make sure I didn't break anything.  All I did was cut-paste the lines to a few lines above, but hey, never hurts to double-check!
 2016-03-22 13:11:48 -04:00
Datraen
b36edb0690 Merge pull request #1213 from Kelenius/topicTime 
Removes topic limiter
 2016-03-22 10:59:22 -04:00
Ithalan
f3066a926f Fixes Anomaly Analyzer reading the wrong variable for the effect's range, resulting in nearly all anomalies erronously showing as transmitting their effect on touch. 2016-03-22 02:27:31 +01:00
Datraen
56e1fbe0a6 Fixes improperly cherry-picked files. 2016-03-21 17:51:26 -04:00
PsiOmegaDelta
e7686dd3e7 Camera fixes and performance tweaks. 
Improves camera EMP handling. Now uses a var and processing to determine when the EMP should end, preventing inconsistent states when a camera is EMPd multiple times.

Reduces the process and bandwidth need for cameras.
* There is now a common camera repository, responsible for setting up cameras once for every invalidation.
* Camera consoles now only updates when the camera cache is invalidated, not every second.
* The console now only presents one network at a time, and only sends the data necessary to view that network (as opposed to sending the data for all cameras).
 2016-03-21 17:30:52 -04:00
Datraen
1a9d1e6f36 Merge pull request #1188 from Neerti/3/14/2016_changeling_additions 
A large amount of changeling changes.
 2016-03-21 14:12:09 -04:00
Kelenius
f41f52dea8 Removes topic limiter 2016-03-21 16:28:15 +03:00
Kelenius
1683761d6a Fixes #1171 2016-03-21 14:22:44 +03:00
Kelenius
c615077568 Merge branch 'master' into oldTurrets 2016-03-21 11:32:26 +03:00
Datraen
7f95bf177e Checks to see if the turf is a floor before continuing to spawn artifacts. 2016-03-20 14:54:05 -04:00
Datraen
996ce92f7f Merge pull request #1184 from Yoshax/510prep 
Ports Byond 510 preperations from Bay
 2016-03-20 13:45:40 -04:00
Datraen
eb6f621ca9 Adds a check to the greytide virus to see if the APCs are operating. 2016-03-18 15:20:48 -04:00
Kelenius
f2a504d822 Merge branch 'master' into plzNoFat 2016-03-18 21:38:34 +03:00
Datraen
fe9d3fd4c4 Merge pull request #1027 from Kelenius/mobCleanup 
Changes types of ghosts and eyes
 2016-03-18 13:50:47 -04:00
Kelenius
bc1bbafaad new_player: absolute pathing 2016-03-17 16:35:09 +03:00
Neerti
e9b9e3c5e1 Merge pull request #1189 from Kelenius/varCleanup 
Moves a few vars where they should be
 2016-03-16 21:35:05 -04:00
Neerti
48427ea301 Merge pull request #1196 from Kelenius/goFaster 
Optimizes restart
 2016-03-16 21:33:58 -04:00