cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-25 16:54:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,270 Commits 9 Branches 0 Tags
7f9acb1fa03e382d8e579bf62c7dfa67fa9eab52
Commit Graph

6783 Commits

Author SHA1 Message Date
Spades
0bf340762e Books! And HoS office improvements! 
- HoS office now has a camera because fuck you that's why.
- HoS office and Security wing now have Security wall radios.
- Fixed Security wall radio icons.
- Fixed direction icons of all radios on the map.
- Added SOP book.
- Added Command Guide book (Chain of Command).
 2017-10-23 23:10:01 -04:00
Spades
0e82f4f3bf Merge pull request #2332 from Verkister/backuppery 
Adds a mind backup nifsoft and fixes sleevemate nif and quit issues.
 2017-10-21 23:17:49 -04:00
Yumi (AKA Gowst)
7b87993993 Adds halloween pumpkins and jack-o'lanterns, pumpkins replaces all potted plants on station 2017-10-20 00:52:16 -05:00
Verkister
1dce46894a Should fix bypassing the round quit with sleevemate 2017-10-20 03:12:58 +03:00
killer653
280722332b Part 2 2017-10-16 22:17:14 -04:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Neerti
7b5f8bddd1 Merge pull request #4081 from Cameron653/512_FILTER_FIX 
BYOND 512 Compiling Errors Fix
 2017-10-16 18:47:47 -04:00
Anewbe
b14766ff92 Merge pull request #4078 from Mechoid/Projectile_Turretfunctions 
Turret Targetting Update
 2017-10-16 14:03:05 -05:00
mistyLuminescence
f87a6d7d8c Adds a white robe. (#4074) 
* - Adds a hooded robe themed after the Rishizirr, the mythological Tajaran angels of death said to shepherd the souls of those who die while snowed in to their designated afterlife. Perfect for Hallowe'en!

* Adds a hooded white robe.

* Fixes the white robe.

* Fixes the robe, again
 2017-10-16 04:27:03 -05:00
killer653
fb8ba69ada Fixes all the other stuff 2017-10-15 20:56:13 -04:00
killer653
0080539924 More fixes 2017-10-15 19:54:50 -04:00
Mechoid
9a04744ab6 Turrets detect targets through metal foam. 2017-10-15 13:48:38 -07:00
Ansari
768dc2d7c0 Port over Chemistry bag from Paradise (#4067) 
* Add in chemistry bag from Paradise, based on /tg/ bag. Add it to biogenerator. Add it to wardrobe.

* Make itemsize large so it cannot be put in backpack. Slowdown = 1.
 2017-10-15 15:04:56 -05:00
Neerti
0a3d85647a Merge pull request #4011 from Anewbe/railgun 
Ports Bay's railguns, and assorted gun sprites
 2017-10-14 01:43:45 -04:00
Mechoid
56ec5ec94c Adds three flame-themed illegal Mech weapons and more. (#4058) 
* Adds three flame-themed illegal Mech weapons. Allows anything using apply_effects to be incendiary and ignite/apply firestacks. Also absolute-paths the spilled fuel effects.

* Removes world << because I'm a good coder honest.

* Why does Git do this for no reason.
 2017-10-13 23:32:52 -05:00
Belsima
e61efc752a more gammers (#4052) 
* Update medsci.dm

* Update miscellaneous.dm

* Update arcade.dm

* Update transform.dm

* Update implanter.dm

* Update shuttle_console.dm
 2017-10-13 23:32:22 -05:00
Anewbe
f9fd492caf Merge pull request #4060 from Neerti/10/13/2017_balling_out_of_control 
Adds the Ionic Rapier
 2017-10-13 23:31:38 -05:00
Anewbe
15ece5cd98 Merge pull request #4042 from MisterLayne/10/10/2017_AddsTRays 
Implements new T-Rays
 2017-10-13 09:49:28 -05:00
Neerti
0e57b66f6a Adds an Esword subtype that wrecks synthetics. 
Ports /tg/'s esword and double esword sprites, both item and inhands.
Hivebot isSynthetic() now returns true.
 2017-10-13 02:17:27 -04:00
Spades
4bc0708f01 Merge pull request #2282 from Cyantime/grublarvs 
Improves solargrub larva
 2017-10-12 18:12:31 -04:00
Belsima
3069df74a4 Spelling + drone (#4050) 2017-10-12 11:14:46 -05:00
Neerti
7cafd7d239 Merge pull request #4002 from Anewbe/outfits 
Ports Bay's outfit system
 2017-10-11 22:00:45 -04:00
MisterLayne
392aa1d8bc Makes the new T-Ray Scanners available 2017-10-11 17:11:49 -04:00
Neerti
d848197534 Merge pull request #4029 from Anewbe/skeletons 
Adds Skeletons for background use
 2017-10-11 14:48:41 -04:00
Cyantime
612db9b2c0 wooorms 2017-10-11 13:29:31 -04:00
Neerti
1f0bb5891c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/28/2017_web_shuttles 
# Conflicts resolved:
#	code/modules/busy_space/organizations.dm
 2017-10-10 01:19:53 -04:00
Neerti
7225ea2b66 Read github PR for details. 2017-10-10 00:48:27 -04:00
Neerti
b4a1e16132 Merge pull request #4027 from Anewbe/landmark_fixes 
Landmark fixes
 2017-10-09 03:41:47 -04:00
Cameron Lennox
e650c62c6b LOTS OF FIXES 2017-10-08 18:05:27 -04:00
Cameron Lennox
15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Anewbe
ff7c4fe45a Makes a bunch of things fit in holsters 2017-10-07 17:24:18 -05:00
Anewbe
1f9a14ffd7 Adds Skeletons for background use 2017-10-06 20:40:12 -05:00
Anewbe
ccd90031fa Merge pull request #4018 from MisterLayne/10/4/2017_DufflebagsSci 
Science Dufflebag
 2017-10-06 10:51:05 -05:00
Anewbe
098bb66e4a Makes landmarks invisible, mobcorpse landmark actually despawns 2017-10-05 21:44:26 -05:00
MisterLayne
8aed98be14 Adds science dufflebag 2017-10-05 16:26:56 -04:00
Anewbe
66837464d2 Implanters should have an icon again 2017-10-04 23:07:59 -05:00
Anewbe
82f24079f4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into outfits 
# Conflicts:
#	code/game/jobs/job/assistant.dm
#	code/game/jobs/job/civilian.dm
#	code/modules/admin/admin_verbs.dm
 2017-10-04 20:08:55 -05:00
Anewbe
10b0264c6a Yet more work on the Outfit System 2017-10-04 20:05:20 -05:00
Neerti
4db89d42f5 Merge pull request #4014 from Anewbe/drone_permits 
Drone permits can now be worn
 2017-10-04 20:59:29 -04:00
Anewbe
2fde466a21 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into outfits 2017-10-03 23:24:12 -05:00
Neerti
cf263e348e Merge pull request #3981 from Anewbe/gravetender 
Adds the gravekeeper lost borg module
 2017-10-03 23:01:15 -04:00
Spades
54d4069eff Merge pull request #2195 from Verkister/returnofthelongpup 
Re-enables and fixes the CARGO EXCLUSIVE oties. Plus a couple new features! (Psst hey)
 2017-10-03 22:31:24 -04:00
Spades
aa10a65b30 OSHA approved map changes 
- More fire lockers and oxy closets in places.
- All elevator entrances have emergency shutters in front of them, which
can be used as a defacto airlock if needed.
- All fire closets have emergency toolboxes now.
- Other minor map edits.
 2017-10-03 02:49:45 -04:00
Anewbe
b393bb897d Repaths permits as accessories 2017-10-03 00:04:58 -05:00
Anewbe
bf6c9ba4b8 Drone permits can now be worn 2017-10-02 23:14:14 -05:00
Anewbe
a248a4a4a1 Ports Bay's railguns, and assorted gun sprites 2017-10-02 17:29:24 -05:00
Anewbe
5e635aff46 Adds a hacky method to put loadout implants in the user's antag records. Fixes a runtime. 2017-10-02 00:11:27 -05:00
Anewbe
46e411f80f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into tracking_implant 2017-10-01 21:52:36 -05:00
Anewbe
d0a22df9c3 Continues work on outfits 2017-10-01 20:50:30 -05:00
Anewbe
e82ea2d599 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into implanter_fix 
# Conflicts:
#	icons/obj/items.dmi
 2017-10-01 13:13:13 -05:00