cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,922 Commits 6 Branches 0 Tags
0c2f8cedb5cc7c6534b3f36469a508a80f5c679b
Commit Graph

2003 Commits

Author SHA1 Message Date
Heroman
ed55a2f6cd Fixes Offduty engi and explorers spawning without survival boxes 2019-05-05 08:17:51 +10:00
Atermonera
8e724ad32c Merge pull request #6133 from Heroman3003/cart-tweek 
Minor PDA cartridge tweaks
 2019-05-01 14:08:33 -04:00
Novacat
fb52ec08c6 Merge pull request #5114 from Novacat/nova-weapons 
Expedition Sub-department
 2019-04-28 22:57:13 -04:00
Neerti
16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
Heroman
703c27da7e Refactors shadekin 2019-04-28 15:10:06 +10:00
Novacat
536d209e29 Update civilian.dm 2019-04-27 22:33:06 -04:00
Anewbe
13ccd7533f Removes Resident from the Southern Cross 2019-04-27 21:05:10 -04:00
Unknown
729b1fc662 Changes off Duty ID Aesthetics 2019-04-25 19:56:47 -04:00
Unknown
f21c5e4430 Adds Subtle Teleporter 
It is also a structure, which should make it easier to use in buildmode. Current uses vanilla portal sprite.
 2019-04-24 20:20:51 -04:00
Unknown
8fef0c5045 Survival Kits for Off Duty Explorers 
...I love those things too much.
 2019-04-24 14:00:11 -04:00
Atermonera
9152030002 Merge pull request #6117 from Neerti/ai_shell_manifest_fix 
Hides AI Shells from the manifest.
 2019-04-22 14:31:22 -04:00
Unknown
afc0d67f21 [WIP] Expedition Sub-department 
- Moves explorer job roles from their respective departments into an Exploration sub-department
- CHAIN OF COMMAND WILL REMAIN UNCHANGED
- ACCESS WILL REMAIN UNCHANGED
Note: Pathfinder's minimum access is getting tweaked, in case minimum access ever gets used.

This is a purely clerical change that is being done for two reasons.
1: To enable off duty exploration role, important for the upcoming timeclock PR. The upcoming timeclock functionality will cause difficulties for expedition roles, due to, at present, being in a wide variety of different departments.
2: Generally, explorer roles in other departments tended to create confusion, as people would ask (or even demand) those roles to do station-side duties, even if their access (or lack thereof) made it impossible.
 2019-04-21 17:05:58 -04:00
Neerti
068ac72e10 Merge pull request #6076 from Heroman3003/double-shock-fix 
Fixed the vendor machines zapping twice
 2019-04-14 02:24:50 -04:00
Heroman
c62a184d15 Fixes organizations runtiming 2019-04-12 19:24:04 +10:00
Novacat
cc0893409f Merge pull request #4960 from Heroman3003/telenommening 
Fixes telenoms via command teleporter, fixes command teleporter sprites
 2019-04-08 19:15:58 -04:00
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Heroman
e05deb6566 Fixes ability to telenom via command teleporter 2019-04-08 18:42:29 +10:00
Neerti
1d59d8683c Replaces AI-controlled Maint Drones with AI-controlled Borg Shells 2019-04-06 05:07:05 -04:00
Novacat
d7c7c073a5 Merge pull request #4868 from Novacat/nova-weapons 
Adds liquidprotein rations
 2019-04-05 17:17:53 -04:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
Spades
c701f8c1c7 Merge pull request #4907 from Mewchild/MC-Virology 
Makes Virology Usable
 2019-04-04 22:08:10 -04:00
Mewchild
7128de61dd MAkes Virology Usable 2019-04-04 19:38:11 -05:00
Heroman
72eef4ad4f Both radiation procs should respect it. 2019-04-05 05:14:27 +10:00
Heroman
7f53eb35c3 Provides proper shielding to areas meant to be shielded 2019-04-05 05:13:35 +10:00
Novacat
da63d0bacf Merge branch 'master' into nova-weapons 2019-03-30 23:00:48 -04:00
Neerti
f8c9664178 Explorer Update - Cataloguers 2019-03-30 16:19:24 -04:00
Unknown
99550bff63 Adds ration supply packs 2019-03-29 09:40:24 -04:00
Novacat
956809d681 Merge branch 'master' into upstream-merge-5985 2019-03-28 21:32:18 -04:00
elgeonmb
9d056decda Adds the Zaddat Race + Modifies pressure damage calculations 2019-03-28 16:54:32 -04:00
Neerti
3256202407 [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work 2019-03-27 22:02:07 -04:00
Novacat
1e5b351f43 Merge pull request #4711 from VOREStation/upstream-merge-5875 
[MIRROR] Tommygun now Tommy Gun
 2019-03-27 20:45:46 -04:00
Unknown
7f4afa1bf3 Removes redundant supply packs 2019-03-27 18:52:08 -04:00
Atermonera
d27d4fa414 Merge pull request #5845 from krumpmeboyz/plswrkcargoexpac 
Adds three more crates
 2019-03-27 18:45:28 -04:00
Novacat
dce3466f3b Merge pull request #4684 from VOREStation/upstream-merge-5814 
[MIRROR] [READY]Makes a bunch of processes subsystems instead
 2019-03-27 17:46:31 -04:00
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
Unknown
55b4d304f5 Conflict Resolution Part One 2019-03-27 15:21:58 -04:00
Neerti
fe0b7373b3 Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it 2019-03-27 14:49:30 -04:00
kevinz000
dfbd0bd72b Upgrades SDQL2 and refactors it to a datum 2019-03-27 11:50:49 -04:00
Novacat
e660a872e5 Merge pull request #4636 from TheFurryFeline/patch-1 
Collar Crate
 2019-03-27 04:46:19 -04:00
Novacat
70d0a30868 Merge pull request #4635 from TheFurryFeline/master 
Holocollar Addition to Autolathe. Take 3
 2019-03-27 04:46:02 -04:00
Anewbe
09b01407e3 Adds Various Sounds, Looping Sound System 2019-03-27 03:55:21 -04:00
Neerti
29b54f0ba5 Fixes Beam() 2019-03-27 03:30:20 -04:00
Neerti
86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Unknown
976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00
Neerti
627cdecf66 Subspace Jammer now blocks signalers, suit sensors, lasts longer 2019-03-04 22:58:41 -05:00
Spades
4320afc530 Merge branch 'master' into upstream-merge-5757 2019-03-02 08:05:51 -05:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Spades
4b19e3a9b3 Merge pull request #4538 from VOREStation/upstream-merge-5726 
[MIRROR] Refactors Sun and Inactivity processes to subsystems, and a few globa lvariables to be managed
 2019-02-23 12:01:38 -05:00
Sebbe9123
fcd8665632 re-adds wolfgirls and catgirls to crates. 2019-02-18 10:49:08 +01:00
Sebbe9123
0ad302c3d1 Re-adds birbs and fennecs to the hydro crates. 2019-02-18 10:47:39 +01:00