cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,735 Commits 8 Branches 0 Tags
8d3ceab28783ef3304ea069ff9a6e2a7e94e7af2
Commit Graph

13467 Commits

Author SHA1 Message Date
killer653
3cd3054811 Fixes filter being used, which prevented compiling 2017-10-15 19:01:55 -04:00
Mechoid
9a04744ab6 Turrets detect targets through metal foam. 2017-10-15 13:48:38 -07:00
Anewbe
35dd1a957e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into rings 2017-10-15 15:07:21 -05:00
Anewbe
3c2831e5d9 Adds rings 2017-10-15 15:05:52 -05: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
Belsima
cdb93fb7f8 fixes biogenerator grammar (#4063) 2017-10-14 20:42:59 -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
Neerti
e8edcfb40e Merge pull request #4059 from Anewbe/tunguska 
Comments out the Tunguska spawn chance, in preparation for the new map
 2017-10-14 01:41:40 -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
165ad5f839 Removes the loyalty implanting from CD and IAA 2017-10-13 18:07:13 -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
Spades
a244d50058 Sensible Job Titles (#4026) 
* Sensible Job Titles

Basically #3986 except condensed to the ones that were actually good,
plus one more.

- Gardener is now Botanist. Gardener has been moved to an alt title.
This is more fitting for what the role actually does. Besides, who calls
them the gardener? I call them botanists.
- The alt title Commander is now Security Commander, to avoid further
confusion.
- Research Director is now Research Supervisor by default which was
formerly an alt-title. Head of Research has been added as an alt title
in its place. Research _Director_ has been removed entirely. Really,
either of these would be nice as the new main title.

I thought about changing "Colony Director" to "Site Director" while I
was at it, but it's a self sufficient facility no matter how you look at
it, so it's a colony.

* ¯\_(ツ)_/¯
 2017-10-13 09:28:06 -05:00
Neerti
a8513844ec Adds a Trait system (#4048) 
* Works on trait system, wip.

* Finalizes traits.
Fixes a few bugs with medical machines assuming a max health of 100.
 2017-10-13 01:17:39 -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
Anewbe
7fc9e1a60b Comments out the Tunguska spawn chance, in preparation for the new map 2017-10-13 00:51:16 -05:00
Neerti
e582a52e91 Merge pull request #4047 from Anewbe/cloning_machine_fix 
Should make upgraded cloners spit out clones again
 2017-10-13 01:25:30 -04:00
Belsima
e97124bb6c Minor grammar fixes + cold protection. (#4044) 
* Removes extra space.

* Grammar fixes + cold protection.
 2017-10-12 22:51:16 -05:00
Anewbe
069adbb538 Ids should have accounts now 2017-10-12 17:01:20 -05:00
Anewbe
332bcbd114 Fixes job access 2017-10-12 15:27:18 -05:00
Belsima
3069df74a4 Spelling + drone (#4050) 2017-10-12 11:14:46 -05:00
Belsima
ad9d876922 they spelled it wrong (#4049) 2017-10-12 11:14:30 -05:00
Anewbe
755ac361bb Should make upgraded cloners spit out clones again 2017-10-11 22:49:23 -05:00
Anewbe
dea7346b94 Fixes the autologging items in antag records 2017-10-11 21:16:18 -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
Anewbe
2530fdf2a5 Merge pull request #4040 from Neerti/9/28/2017_web_shuttles 
Adds 'Web Shuttles' for the Southern Cross
 2017-10-10 23:41:47 -05:00
Neerti
92b72cfbed Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/30/2017_golems_and_animals 2017-10-10 01:21:39 -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
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
4459d7087a Revert "Does more prep for the Event Manager role" 2017-10-04 18:33:34 -05:00
Anewbe
cf9245b5fb More work on outfits 2017-10-04 11:49:24 -05:00
Anewbe
094df467a9 Continues work on Outfits 2017-10-04 01:14:09 -05:00
Anewbe
2fde466a21 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into outfits 2017-10-03 23:24:12 -05:00
Neerti
24f517336b Merge pull request #4013 from Anewbe/event_rank 
Does more prep for the Event Manager role
 2017-10-03 23:26:01 -04:00
Neerti
cf263e348e Merge pull request #3981 from Anewbe/gravetender 
Adds the gravekeeper lost borg module
 2017-10-03 23:01:15 -04:00
Neerti
fe9822362c Merge pull request #3979 from Anewbe/tracking_implant 
Improves tracking implant code, adds a tracking implant variant to the loadout
 2017-10-03 22:58:10 -04:00
Anewbe
46994b378d Adds a null check for not having a backpack 2017-10-03 16:16:35 -05:00