cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 23:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,973 Commits 7 Branches 0 Tags
2a100c5cb1b69a0d956ce75bca320c42e6979ccc
Commit Graph

4841 Commits

Author SHA1 Message Date
Unknown
2a100c5cb1 Command key box 2019-04-03 15:11:06 -04:00
Unknown
9fa575698b Conflict Resolution 2019-03-30 20:13:49 -04:00
Neerti
5967a92f02 Lynx Fixes Runtimes 2019-03-30 18:51:00 -04:00
Neerti
f8c9664178 Explorer Update - Cataloguers 2019-03-30 16:19:24 -04:00
Unknown
5ce5403b17 Apparently it exists and is in the wrong dmi 2019-03-30 00:52:46 -04:00
Unknown
42991bb551 Replaces clutch purse sprite 
Sprite is temporary, but makes the item usable.
 2019-03-30 00:19:09 -04:00
Unknown
baffac60fc Lynx Fixes Runtimes 
There are still a couple of remaining runtimes...
 2019-03-28 23:50:37 -04:00
Novacat
4801fe8c8e Merge pull request #4860 from Heroman3003/id-restorer 
Added ID restoration terminal
 2019-03-28 22:03:17 -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
Novacat
4c7370fb5d Merge pull request #4811 from VOREStation/upstream-merge-5981 
[MIRROR] Handtele no longer relies on teleporter being mapped in in very specific way
 2019-03-28 21:28:30 -04:00
Novacat
3f659d909c Merge pull request #4758 from VOREStation/upstream-merge-5947 
[MIRROR] Rewrites Atmospherics
 2019-03-28 20:22:30 -04:00
Unknown
d3837b76e8 Conflict Resolution 2019-03-28 19:41:16 -04:00
Anewbe
8ed384b38c Rewrites Atmospherics 2019-03-28 19:25:11 -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
Novacat
b004d7d847 Merge pull request #4721 from VOREStation/upstream-merge-5901 
[MIRROR] Unclogs powersink drains
 2019-03-28 15:49:58 -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
Heroman
867eac413a Adds unique icon for ID restorer (courtesy of VerySoft) 2019-03-28 15:56:47 +10: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
2870ba8271 Merge pull request #4695 from VOREStation/upstream-merge-5856 
[MIRROR] Fixes candle sprites
 2019-03-27 20:54:57 -04:00
Novacat
94ae8fcc2a Update candle.dm 2019-03-27 20:23:59 -04:00
Unknown
eca7086b45 Conflict Resolution 2019-03-27 19:24:13 -04:00
Anewbe
ac34c4b763 Stasis bags don't murder patients 2019-03-27 19:18:13 -04:00
Novacat
ffed098bf6 Merge branch 'master' into upstream-merge-5856 2019-03-27 19:00:41 -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
Novacat
97e98dd04d Merge pull request #4682 from VOREStation/upstream-merge-5829 
[MIRROR] Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
 2019-03-27 16:37:45 -04:00
Unknown
ec19a66eff Conflict Resolution 2019-03-27 16:36:41 -04:00
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
Unknown
6636f1ba37 Conflict Resolution Part 2 2019-03-27 15:51:05 -04:00
Novacat
abcde8fe5f Merge pull request #4680 from VOREStation/upstream-merge-5825 
[MIRROR] Adds ability to put butts in boxes
 2019-03-27 15:19:30 -04:00
Novacat
1bbb64494e Merge pull request #4678 from VOREStation/upstream-merge-5835 
[MIRROR] Updates Religion Lists + Adds Religious Paraphernalia
 2019-03-27 15:19:15 -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
Novacat
cfe200ffc9 Merge pull request #4665 from VOREStation/upstream-merge-5824 
[MIRROR] Fixes non-black/white paint buckets not actually having paint in them
 2019-03-27 14:12:46 -04:00
Spades
eb0e2ec1f5 Guns sounds refactor and improvements 2019-03-27 10:42:18 -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
Novacat
7a13562736 Merge pull request #4620 from VOREStation/upstream-merge-5779 
[MIRROR] Emergency tanks start full
 2019-03-27 03:40:45 -04:00
Neerti
585b688709 Adds Identification System, New Autoinjectors 2019-03-27 02:25:55 -04:00