cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-10 09:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,560 Commits 7 Branches 0 Tags
f279faf2fd95468c19ac58ddfdfbdeb1c0fbd7dc
Commit Graph

1339 Commits

Author SHA1 Message Date
Atermonera
9ea820fd7f Merge pull request #6058 from Neerti/permastuns_are_bad 
Removes umbrella permastuns. Adds wind mechanics.
 2019-04-26 19:32:29 -04:00
Heroman3003
e3e715454b Makes placeholder entries for lore writing 2019-04-23 11:13:42 +10:00
Atermonera
8e9ba5911a Merge pull request #6098 from Heroman3003/laserpoint-fix 
Fixes laser pointers targeting through walls
 2019-04-18 13:24:40 -04:00
Neerti
3f7d2a0450 Fixes fireaxe cabinets 2019-04-16 22:00:42 -04:00
Novacat
c1d44a008a Merge pull request #4966 from Novacat/nova-survival 
Rosettes, radiopack sprites
 2019-04-10 19:46:09 -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
Unknown
5e9ac3f00d Rosettes, radiopack sprites 
- Adds Rosettes and Colorable Rosettes
- Adds on mob sprite for the subspace radio
 2019-04-08 14:07:24 -04:00
Neerti
1d59d8683c Replaces AI-controlled Maint Drones with AI-controlled Borg Shells 2019-04-06 05:07:05 -04:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
Neerti
f8c9664178 Explorer Update - Cataloguers 2019-03-30 16:19:24 -04:00
Novacat
26660c5f70 Merge pull request #4832 from VOREStation/upstream-merge-5985 
[MIRROR] Subspace Jammer now blocks signalers, suit sensors, lasts longer
 2019-03-28 21:59:48 -04:00
Novacat
e47a99824c Update jammer.dm 2019-03-28 21:46:37 -04:00
Unknown
3aa0fdfda5 Removes conductive flags from VR stuff 2019-03-28 21:45:38 -04:00
Neerti
30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
Novacat
956809d681 Merge branch 'master' into upstream-merge-5985 2019-03-28 21:32:18 -04:00
Unknown
32bab4ba00 ...Part two 2019-03-28 19:08:04 -04:00
Unknown
58427861e8 Fixes compile error 2019-03-28 19:06:53 -04:00
Unknown
4df295de75 Conflict Resolution 2019-03-28 18:43:38 -04:00
Mechoid
023815e2d2 Flash rebalance. 2019-03-28 18:23:33 -04:00
Novacat
65cd059497 Merge pull request #4751 from VOREStation/upstream-merge-5869 
[MIRROR] Adds the Zaddat Race + Modifies pressure damage calculations
 2019-03-28 18:17:11 -04:00
Novacat
f797a8a715 Merge pull request #4728 from VOREStation/upstream-merge-5899 
[MIRROR] Ghosts who antagHUD can't make communicator calls
 2019-03-28 17:25:35 -04:00
elgeonmb
9d056decda Adds the Zaddat Race + Modifies pressure damage calculations 2019-03-28 16:54:32 -04:00
Unknown
3e2d0bf9ea Conflict Resolution Part Two 2019-03-28 15:09:40 -04:00
Atermonera
7403591727 Ghosts who antagHUD can't make communicator calls 2019-03-28 15:05:25 -04:00
Novacat
56752a1337 Merge branch 'master' into upstream-merge-5901 2019-03-28 14:37:02 -04:00
Novacat
aefedea4a3 Merge pull request #4694 from VOREStation/upstream-merge-5858 
[MIRROR] Suit coolers don't overheat in vacuum
 2019-03-27 18:58:47 -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
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
Unknown
4e67e1b9ab Conflict Resolution 2019-03-27 04:11:30 -04:00
Anewbe
09b01407e3 Adds Various Sounds, Looping Sound System 2019-03-27 03:55:21 -04:00
Neerti
585b688709 Adds Identification System, New Autoinjectors 2019-03-27 02:25:55 -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
Atermonera
131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Neerti
627cdecf66 Subspace Jammer now blocks signalers, suit sensors, lasts longer 2019-03-04 22:58:41 -05:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Poojawa
6f2548e47b Merge remote-tracking branch 'refs/remotes/origin/master' into upstream/upstream-merge-5735 2019-02-02 03:55:21 -06:00
Atermonera
439afee2ab Unclogs powersink drains 2019-01-26 17:54:34 -05:00
Spades
30ab44613d Merge pull request #4540 from VOREStation/upstream-merge-5714 
[MIRROR] Borg, Gripper, and Integrated Circuit interaction update.
 2019-01-21 11:42:38 -05:00
Anewbe
8e9e83fde0 Merge pull request #5858 from Atermonera/suitcooler_pressurization 
Suit coolers don't overheat in vacuum
 2019-01-18 09:15:04 -05:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Unknown
05b876aa3a Adds an Admin Subspace Jammer for events 
I plan on doing a stationary version down the road but that will require a lot more work.
 2018-12-31 09:13:39 -05:00
Spades
e956afedbf Merge pull request #4529 from VOREStation/upstream-merge-5649 
[MIRROR] ᵗᵉᵉⁿʸ ᶠˡᵃˢʰˡᶦᵍʰᵗ ᵗʷᵉᵃᵏ
 2018-12-12 21:24:38 -05:00
Spades
9b92dc1836 Merge pull request #4462 from Novacat/nova-basicfixes 
Expedition Job and Gear tweaks
 2018-12-08 09:44:15 -05:00
kevinz000
fc178c1e04 Makes math helpers defines for performance 2018-12-06 16:15:00 -05:00
Atermonera
0a77d0d70d Borg, Gripper, and Integrated Circuit interaction update. 2018-12-03 20:22:47 -05:00
Atermonera
034c3e6615 Merge pull request #5649 from lbnesquik/Kates-Flashlight-F 
ᵗᵉᵉⁿʸ ᶠˡᵃˢʰˡᶦᵍʰᵗ ᵗʷᵉᵃᵏ
 2018-12-01 00:33:49 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Unknown
797b9fa6e7 More Access Fixes 2018-11-24 15:10:29 -05:00
Unknown
3969e2ab09 Tightens up radio access a bit 2018-11-18 15:16:26 -05:00