cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,647 Commits 5 Branches 0 Tags
c11c37514c52a25efabc9c5f3a973be40179a2c5
Commit Graph

1998 Commits

Author SHA1 Message Date
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
Sebbe9123
f95e5bae68 Fixes up science cargo packs, Oties disabled. 2019-02-18 10:42:23 +01:00
Poojawa
8d178972a1 ports #4581 Startup Runtime fix 2019-02-02 06:03:40 -06:00
Spades
b86d6dab13 Tommygun now Tommy Gun (#5875) 
* Tommygun now Tommy Gun

https://github.com/PolarisSS13/Polaris/pull/5837

* Corrects sprite names

I figure this can stay as it is.
 2019-01-22 23:22:23 -05:00
Hawk_v3
2bc1f83de7 Merge remote-tracking branch 'upstream/master' 2019-01-15 20:56:39 +00:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Cameron653
9dd973221d Resolves compile errors with the exception of map errors. 2019-01-12 21:09:29 -05:00
TheFurryFeline
af03e2613a Correction to Collar Crate file path 
Fixing an overlooked file path error
 2019-01-05 20:44:07 -05:00
TheFurryFeline
add1d760bf Collar Crate 
Ports from ChompStation an addition to Cargo under Recreation: one of each collar per crate.
 2019-01-05 19:30:14 -05:00
Spades
36c586100a Update general_vr.dm 
Just removes a comment I didn't think we needed anymore.
 2019-01-05 12:58:36 -05:00
TheFurryFeline
a60e466810 Create general_vr.dm 
Adds Holocollar for real to the autolathe specifically for VoreStation.
 2019-01-05 11:26:29 -05:00
TheFurryFeline
b878f1bb89 Reverting for adding to a new file. 
Now to do general_vr.dm
 2019-01-05 10:54:42 -05:00
TheFurryFeline
2da1419155 Holocollar Addition to Autolathe 
Ports from ChompStation an addition to the Autolathe: Holocollars for the ultimate submissives or for the dommies to print for their slave/pets.
 2019-01-02 14:33:07 -05:00
Ketrai
7f474c490d Update hospitality_vr.dm 2019-01-01 16:24:03 +01:00
Hawk_v3
b6988c5a09 Merge remote-tracking branch 'upstream/master' 2018-12-15 19:37:28 +00:00
Spades
670e5e3765 Merge pull request #4523 from VOREStation/upstream-merge-5718 
[MIRROR] New hair + underwear
 2018-12-12 21:24:49 -05:00
Neerti
60f88039ea Adds several new map/event oriented objects 2018-12-07 18:49:01 -05:00
Hawk_v3
f317802ada Merge remote-tracking branch 'upstream/master' 2018-12-07 00:57:12 +00:00
kevinz000
fc178c1e04 Makes math helpers defines for performance 2018-12-06 16:15:00 -05:00
Atermonera
bf86b408fa Refactors Sun and Inactivity processes to subsystems, and a few globa lvariables to be managed 2018-12-03 20:21:17 -05:00
Atermonera
3fb5d15c43 Merge pull request #5718 from kartagrafi/hairunderwearwhatever 
New hair + underwear
 2018-12-01 00:17:11 -05:00