cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-01 21:13:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,730 Commits 8 Branches 0 Tags
b204735fa23e6bb4e151c82009bb97d6b28a032d
Commit Graph

10198 Commits

Author SHA1 Message Date
Nadyr
457df85c54 Merge pull request #4333 from CHOMPStation2/upstream-merge-13043 
[MIRROR] Another pAI update
 2022-06-06 18:41:35 -04:00
Nadyr
985216ba9e powder that makes you say yes 2022-06-06 18:25:13 -04:00
Nadyr
5d5eb0bc46 powder that makes you say yes 2022-06-06 18:23:51 -04:00
Casey
b249f87d8e Another pAI update 2022-06-05 22:02:24 +00:00
Casey
d251046e35 Brings fairness back to holodeck 2022-06-05 21:51:51 +00:00
Nadyr
1d004e4bb8 Merge branch 'master' into upstream-merge-13038 2022-06-04 20:23:28 -04:00
Nadyr
ddc0c05b1f Merge pull request #4318 from CHOMPStation2/upstream-merge-13031 
[MIRROR] pAI and emote tweaks and upgrades
 2022-06-04 20:20:56 -04:00
Nadyr
4a04dddd7d Merge pull request #4303 from CHOMPStation2/upstream-merge-13014 
[MIRROR] Splits the scanners into separate files
 2022-06-04 20:20:27 -04:00
Nadyr
97af724389 powder that makes you say yes 2022-06-04 19:50:46 -04:00
Casey
3d5d4f1be8 Makes new pAI obtainable 2022-06-04 20:03:22 +00:00
Casey
f958518ea9 Merge pull request #13035 from lm40/nogods 
localizes religion and adds custom chaplain titles
 2022-06-04 16:38:53 +00:00
Casey
d3e0d8524c pAI and emote tweaks and upgrades 2022-06-04 10:00:21 +00:00
Verkister
49472b199a Fixes recursive explosions 
Ancient-ass abandonware code finally updated to support multi-z and multiple explosions
 2022-05-31 18:52:39 +03:00
Casey
f1122fd4b5 Duke's Mapping Competition: Burrito's Lake Map 2022-05-29 17:50:34 +00:00
Casey
e5cb4ab052 Splits the scanners into separate files 2022-05-29 17:45:06 +00:00
Verkister
52656780e5 Fixes explosions 
At least worked fine on local in all tests and types of explosions i tested out (admin and weldertank) in wilderness and on station.
I suppose it had been a byond change after all that hadn't been quite as lenient with fucked up unindented archaic shapes of code.
Probably gonna shove it upstreams as well if it happens to do the trick on live as well.
 2022-05-28 18:39:39 +03:00
Nadyr
96b9b449fc powder that makes you say yes 2022-05-27 15:54:25 -04:00
Casey
4aa0977f19 A couple more engineering QoL changes. 2022-05-22 18:24:54 +00:00
Rykka
553f1bba47 Missing Gun Sprite Fixes 
- Fixes C20R missing sprite when empty
- Fixes Z8/Z9 missing sprite when empty
- Fixes Laser Cannon not having a sprite at all
- Fixes Xray Laser not having a sprite at all
- Fixes Anti-Particle Weapons (yes all of them) not having sprites
- Fixes Alien Pistol missing sprite + missing beam
- Fixes Mini-Uzi missing sprite when magazine removed/empty

Fixes https://github.com/CHOMPStation2/CHOMPStation2/issues/4101
 2022-05-21 17:17:12 -06:00
Casey
61fce152d5 Merge pull request #12974 from foopwo/borgotoys 
Adds a couple of new toys for cyborgs.
 2022-05-15 20:15:29 +00:00
Novacat
4b4ba32e03 Merge pull request #12968 from Heroman3003/RUNTIME-FIX-END-ME 
Fixes runtimes being broken. Removes back-worn watertanks. NO I DO NO…
 2022-05-14 13:05:43 +00:00
Casey
9f6a9a4e6a Merge pull request #12897 from FartMaster69420/cocoon 
Cocoon Metamorphosis
 2022-05-12 19:21:53 +00:00
Razgriz
c3fdc6d677 Merge pull request #4227 from CHOMPStation2/upstream-merge-12934 
[MIRROR] Chest -> Torso Targeting Fixes
 2022-05-11 10:04:45 -07:00
Novacat
0eaa4a68ea Merge pull request #12943 from ItsSelis/selis-patch-pai 
Allow numbers in pAI name
 2022-05-10 14:53:07 +00:00
Novacat
24aa127d67 Chest -> Torso Targeting Fixes 2022-05-09 01:08:04 +00:00
Nadyr
0ccf97a237 Merge pull request #4221 from CHOMPStation2/upstream-merge-12925 
[MIRROR] Adds chemistry kits
 2022-05-08 14:42:45 -04:00
Nadyr
de3c078fad Merge pull request #4199 from CHOMPStation2/upstream-merge-12898 
[MIRROR] Communicator Ringtones
 2022-05-08 14:42:29 -04:00
Nadyr
6c87352aa5 Merge pull request #4211 from CHOMPStation2/upstream-merge-12888 
[MIRROR] The pAI, Bot, and Microwave Tweaks
 2022-05-08 11:10:07 -04:00
Casey
16b58a8b18 Adds chemistry kits 2022-05-08 09:57:10 +00:00
Casey
fbd967128d Merge pull request #12888 from FartMaster69420/pai_and_bots 
The pAI, Bot, and Microwave Tweaks
 2022-05-08 09:46:55 +00:00
Casey
ff911924b5 Merge pull request #12881 from TankTheBirb/master 
Pocket pouch rebalance + obtaining method
 2022-05-08 09:44:33 +00:00
Novacat
5bffcf5062 Communicator Ringtones 2022-05-05 00:44:55 +00:00
Nadyr
19da7df9b5 Merge pull request #4192 from CHOMPStation2/upstream-merge-12861 
[MIRROR] Fixing Stack Deletion
 2022-05-01 18:17:18 -04:00
Nadyr
978e9cb5a5 Merge pull request #4184 from CHOMPStation2/upstream-merge-12856 
[MIRROR] Quick GB tweaks
 2022-05-01 18:05:02 -04:00
Nadyr
6373935f07 Merge pull request #4166 from CHOMPStation2/upstream-merge-12837 
[MIRROR] Stonks!
 2022-05-01 18:04:49 -04:00
Nadyr
13d3cdc2ba Merge pull request #4167 from CHOMPStation2/upstream-merge-12842 
[MIRROR] Adds PoI loader landmarks
 2022-05-01 17:53:38 -04:00
Nadyr
fc07eb3487 Merge pull request #4163 from CHOMPStation2/upstream-merge-12829 
[MIRROR] Salvage+
 2022-05-01 17:42:19 -04:00
Nadyr
672c5ed903 Merge branch 'master' into upstream-merge-12842 2022-05-01 17:34:09 -04:00
Nadyr
4368f09a42 Merge pull request #4159 from CHOMPStation2/upstream-merge-12583 
[MIRROR] [MIRROR] Fixes catwalks making footsteps on everything
 2022-05-01 17:14:50 -04:00
Casey
5591cddadd Merge pull request #12861 from FartMaster69420/stack-patch 
Fixing Stack Deletion
 2022-05-01 03:10:03 +00:00
Razgriz
4ac931f832 Merge pull request #4157 from CHOMPStation2/upstream-merge-12568 
[MIRROR] Fixes the Xenochimera Details not being their own line
 2022-04-29 15:40:43 -07:00
Razgriz
f49e053631 Merge pull request #4154 from CHOMPStation2/upstream-merge-12838 
[MIRROR] Wild!
 2022-04-28 13:53:08 -07:00
Casey
7245e3880d Quick GB tweaks 2022-04-28 06:22:23 +00:00
Razgriz
bd78886a13 Merge pull request #4164 from CHOMPStation2/upstream-merge-12816 
[MIRROR] [MIRROR] Fixes ALL random tech components having a chance of being anomalous
 2022-04-27 02:34:32 -07:00
Razgriz
6aff76ff02 powder that makes you say yes 2022-04-27 02:31:59 -07:00
Razgriz
c92ad71b51 powder that makes you say yes 2022-04-27 02:30:22 -07:00
Razgriz
37480fabd2 Merge pull request #4074 from KeRSedChaplain/postthisratvar 
attempting to re-ignite my desire to code by adding a funny poster
 2022-04-27 02:24:59 -07:00
BlackMajor
720dbbe62c Merge branch 'master' into protean-rework 2022-04-27 20:45:38 +12:00
Casey
35df5c5164 Adds PoI loader landmarks 2022-04-26 21:24:23 +00:00
Casey
d4c6ba9bb7 Stonks! 2022-04-26 21:23:17 +00:00