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

33762 Commits

Author SHA1 Message Date
Unknown
ad181e797a Conflict Resolution 
Also fixes a compiling error with previous PR
 2019-03-28 17:24:03 -04:00
elgeonmb
9d056decda Adds the Zaddat Race + Modifies pressure damage calculations 2019-03-28 16:54:32 -04:00
Novacat
a98ac52678 Merge pull request #4750 from VOREStation/upstream-merge-5886 
[MIRROR] Introduces caseless ammo, and a caseless rifle
 2019-03-28 16:40:13 -04:00
Novacat
77db377d61 Merge pull request #4748 from Heroman3003/mlembulance 
Tempest's saddlebags now double as ambulance siren/light
 2019-03-28 16:39:37 -04:00
Novacat
4bf687c243 Merge pull request #4746 from VOREStation/upstream-merge-5922 
[MIRROR] reduces delay in printing from librarian computer
 2019-03-28 16:38:18 -04:00
Novacat
f98177b682 Merge pull request #4741 from Jwguy/Silver-KoyoFluffApp 
Adds Koyo's Fluff Item Box
 2019-03-28 16:34:41 -04:00
Novacat
be3ecb34ca Merge pull request #4738 from VOREStation/upstream-merge-5913 
[MIRROR] Readds access restrictions to supply computer
 2019-03-28 16:31:58 -04:00
Novacat
615f413354 Merge pull request #4727 from VOREStation/upstream-merge-5798 
[MIRROR] Adds Alien Reality pods, aka AR pods, for use in events or PoIs.
 2019-03-28 16:30:53 -04:00
Novacat
07bbf88d0d Merge pull request #4726 from VOREStation/upstream-merge-5905 
[MIRROR] Woops I misse dit, removes the forced announce from atom proccall
 2019-03-28 16:30:43 -04:00
Novacat
1eea84c861 Merge pull request #4722 from VOREStation/upstream-merge-5897 
[MIRROR] Fixes some circuit bugs.
 2019-03-28 16:30:33 -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
Novacat
1827a34381 Merge pull request #4674 from VOREStation/upstream-merge-5823 
[MIRROR] Egun stun beams are weaker
 2019-03-28 15:49:06 -04:00
Novacat
81d698b94c Merge pull request #4643 from VOREStation/upstream-merge-5790 
[MIRROR] Drop the number of shots of normal and sec-xeno tasers back down to 5.
 2019-03-28 15:48:47 -04:00
Unknown
efdb175d52 Conflict Resolution 2019-03-28 15:02:22 -04:00
Novacat
c570f25dd8 Merge branch 'master' into upstream-merge-5905 2019-03-28 14:55:54 -04:00
Novacat
a4919caba2 Merge pull request #4719 from VOREStation/upstream-merge-5636 
[MIRROR] [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work
 2019-03-28 14:52:51 -04:00
Mechoid
c604e38036 Adds Alien Reality pods, aka AR pods, for use in events or PoIs. 2019-03-28 14:51:50 -04:00
Unknown
2767f5917d Fixes Conflict 2019-03-28 14:49:44 -04:00
Novacat
15dac0304f Merge pull request #4724 from VOREStation/upstream-merge-5877 
[MIRROR] Unfucks Vintage Rifle
 2019-03-28 14:42:43 -04:00
Novacat
741931aa31 Merge pull request #4723 from VOREStation/upstream-merge-5906 
[MIRROR] Gives the auto shotgun a new sprite
 2019-03-28 14:42:10 -04:00
Novacat
cefd175858 Update time.dm 2019-03-28 14:41:14 -04:00
Novacat
09228247c2 Merge branch 'master' into upstream-merge-5897 2019-03-28 14:39:41 -04:00
Novacat
56752a1337 Merge branch 'master' into upstream-merge-5901 2019-03-28 14:37:02 -04:00
Novacat
3a0dbf687b Merge pull request #4720 from VOREStation/upstream-merge-5896 
[MIRROR] Changeling & Straight Jacket modifications.
 2019-03-28 14:35:51 -04:00
Unknown
a4373601f0 Fixes Merge Errors 2019-03-28 13:53:03 -04:00
Unknown
cf39c61c2d Conflict Resolution 
This one made a lynx cry.
 2019-03-28 13:19:19 -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
1b2116bf80 Merge pull request #4714 from VOREStation/upstream-merge-5898 
[MIRROR] Removes the hyphen from default language keys, should make people spew gibberish less
 2019-03-27 21:32:03 -04:00
Novacat
38a4e44526 Merge pull request #4713 from VOREStation/upstream-merge-5900 
[MIRROR] Rig helmets are now airtight when they should be, rather than when they shouldn't
 2019-03-27 21:20:56 -04:00
Novacat
d2cd4ff7b5 Merge pull request #4718 from VOREStation/upstream-merge-5893 
[MIRROR] Additional Hair
 2019-03-27 21:19:42 -04:00
Atermonera
db1fdccdd5 Merge pull request #5898 from Anewbe/more_gibberish 
Removes the hyphen from default language keys, should make people spew gibberish less
 2019-03-27 21:15:27 -04:00
Atermonera
ed933cedc8 Rig helmets are now airtight when they should be, rather than when they shouldn't 2019-03-27 21:12:31 -04:00
Novacat
e0597368d5 Merge pull request #4712 from VOREStation/upstream-merge-5895 
[MIRROR] Fixes some AI bugs.
 2019-03-27 21:08:01 -04:00
Novacat
ed85a74aa9 Merge pull request #4710 from VOREStation/upstream-merge-5894 
[MIRROR] Fixes Some Mob Init Bugs
 2019-03-27 20:55:09 -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
Neerti
519890613f Fixes some AI bugs. 2019-03-27 20:54:31 -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
Atermonera
cbf66a9b0b Merge pull request #5894 from Neerti/pun_pun_fix 
Fixes Some Mob Init Bugs
 2019-03-27 20:42:50 -04:00
Novacat
893976536e Merge pull request #4706 from VOREStation/upstream-merge-5889 
[MIRROR] Allows borgs to move up and down with jetpacks
 2019-03-27 20:39:35 -04:00
Novacat
c69badc1e3 Merge pull request #4704 from VOREStation/upstream-merge-5852 
[MIRROR] Adds a better debug controller verb that can target all controllers/processes/mc/failsafe/config/etc
 2019-03-27 20:39:24 -04:00
Novacat
b3ded9752c Merge pull request #4708 from king5327/vplf 
Fixes protean languages for real this time.
 2019-03-27 20:39:03 -04:00
Novacat
57a6c51691 Merge pull request #4700 from VOREStation/upstream-merge-5872 
[MIRROR] Stasis bags don't murder patients
 2019-03-27 20:29:29 -04:00
Novacat
f15ac5a224 Merge pull request #4697 from VOREStation/upstream-merge-5849 
[MIRROR] Fixes a few mob AI bugs
 2019-03-27 20:29:08 -04:00
Novacat
62820d333a Merge pull request #4690 from VOREStation/upstream-merge-5841 
[MIRROR] Voice changer tweaks and fixes
 2019-03-27 20:27:42 -04:00
Novacat
f827a04eae Merge pull request #4689 from VOREStation/upstream-merge-5845 
[MIRROR] Adds three more crates
 2019-03-27 20:27:30 -04:00
Novacat
94ae8fcc2a Update candle.dm 2019-03-27 20:23:59 -04:00
Novacat
2609d9fc2b Merge branch 'master' into upstream-merge-5889 2019-03-27 20:15:17 -04:00
Unknown
a22ada82f1 Reminder: Yell at Leshana for not tagging edited code. 2019-03-27 20:03:23 -04:00
kevinz000
e105a047e1 Adds a better debug controller verb that can target all controllers/processes/mc/failsafe/config/etc 2019-03-27 19:36:07 -04:00
Novacat
2a28a46e1a Merge pull request #4703 from VOREStation/upstream-merge-5855 
[MIRROR] Fixes Teshari hardsuits + adds sprites for most
 2019-03-27 19:26:12 -04:00