cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,468 Commits 8 Branches 0 Tags
7c492a3d17ec54cb5c0158979f9827a57cb15d53
Commit Graph

16127 Commits

Author SHA1 Message Date
Hawk_v3
9e88f55480 Merge remote-tracking branch 'upstream/release' 2019-09-16 14:57:39 +01:00
Novacat
536f7a946a Update machinery.dm 2019-09-15 23:14:03 -04:00
Heroman3003
421dbe9ab8 removes extra check 2019-09-16 13:06:49 +10:00
Heroman3003
3ef252a2b9 Fixes for real 2019-09-16 13:06:31 +10:00
Hawk-v3
b7a433f914 Merge branch 'master' into space-fox-genocide 2019-09-16 02:34:22 +01:00
Atermonera
8565190e87 Properly fixes library computer runtime (#6455) 
* Fixes runtime in machinery/CanUseTopic() not providing correct number of arguments to ..()

* Fixes ghost interaction bug
 2019-09-15 17:10:24 -04:00
Heroman
c92960feca Some post-release fixes 2019-09-15 06:27:32 +10:00
Cebutris
14d6527103 delete KHI 2019-09-14 13:17:20 -04:00
Hawk_v3
a333c03a3c Merge remote-tracking branch 'upstream/release' 2019-09-14 17:10:36 +01:00
Novacat
7f5256b4d4 Merge pull request #5855 from Novacat/nova-basicfixes 
Emergency quick bugfixes
 2019-09-14 01:48:08 -04:00
Unknown
e0a762949d Fix Part 2 2019-09-14 01:39:06 -04:00
Novacat
013437f96f Merge pull request #5854 from Heroman3003/prelabel 
Fixes Blood-Onator
 2019-09-14 01:20:12 -04:00
Unknown
e9c94bb553 Emergency quick bugfixes 2019-09-14 01:16:53 -04:00
Heroman
31d459f230 Fixes Blood-Onator 2019-09-14 15:01:58 +10:00
Novacat
396c8afdff Merge pull request #5838 from Mewchild/MC-Sofa 
Ports Sofas from CitRP
 2019-09-14 00:39:02 -04:00
Novacat
ab256b75b3 Merge pull request #5846 from Novacat/nova-basicfixes 
Shelter Capsule Improvements
 2019-09-14 00:38:45 -04:00
Novacat
6536770991 Merge pull request #5837 from Novacat/nova-ert 
Centcom Tweaks
 2019-09-13 21:34:33 -04:00
Unknown
5e2abf9fd4 This is becoming a shelter capsule PR 2019-09-12 22:50:03 -04:00
Heroman
237578c833 Reworks Medbay 2019-09-11 20:33:52 +10:00
Mewchild
7462847479 Ports Sofas from CitRP 2019-09-10 00:15:07 -05:00
Unknown
d86972851a Whoops 2019-09-09 23:48:35 -04:00
Unknown
a94aaac8fb More tweaks 2019-09-09 23:37:41 -04:00
Novacat
351bf97f03 Merge branch 'master' into MC-HeadOffices 2019-09-09 21:12:11 -04:00
Novacat
f41e40cff6 Merge pull request #5812 from Heroman3003/debrisfield-filling-parttwo 
More flavor for PoIs
 2019-09-09 21:00:48 -04:00
Hawk_v3
fc97b8233b Merge remote-tracking branch 'upstream/master' 2019-09-08 18:55:37 +01:00
Atermonera
153a7e118a Fixed an issue with multiple boot/shoe overlays. 2019-09-07 23:11:56 -04:00
Atermonera
77cc4e1d31 Fixes runtime in machinery/CanUseTopic() not providing correct number of arguments to ..() (#6443) 2019-09-06 20:10:07 -04:00
Mewchild
3c1e254ede Typo, VR Addition 2019-09-06 16:57:49 -05:00
Heroman
a1a395a1a9 Implements borg spawners 2019-09-06 16:27:51 +10:00
Heroman3003
d6d19dbf2c Adds oldshuttle PoI 2019-09-06 11:36:45 +10:00
TheFurryFeline
03ab1da455 Restore Librarian Slot Number 
Why was this even reduced to 1 when before the refactor, civilian.dm had a Vorestation edit for 2 slots...? Fixing this.
 2019-09-05 09:25:52 -04:00
Unknown
f8c5727e1c Fixes harmless DM warning 2019-09-04 19:54:03 -04:00
Unknown
0397256a8d Sneaks in sleeper fix 2019-09-04 18:18:21 -04:00
Unknown
e34091d1ad Ports 6440 early 
Also moves some new security crate datums to its proper place
 2019-09-03 18:22:32 -04:00
Novacat
87a627ad96 Merge pull request #5785 from Heroman3003/jobtitles 
Refactors job overrides into their own _vr files rather than all in one
 2019-09-03 18:14:04 -04:00
Novacat
ac841a8eb5 Merge pull request #5795 from Heroman3003/interceptiont 
Restricts AI intercepting messages
 2019-09-03 18:10:06 -04:00
Heroman
b3e01dc515 Restricts AI intercepting messages 2019-09-04 04:23:16 +10:00
Novacat
1c8140708b Merge pull request #5789 from Cameron653/Fixes_boots_again 
Fixes the washing bug with boots
 2019-09-03 02:19:14 -04:00
Cameron Lennox
e3073bbb5d Fixes the washing bug with boots 2019-09-03 01:34:54 -04:00
Heroman
7da3f5b96a Refactors job overrides into their own _vr files rather than all in one 2019-09-03 06:51:06 +10:00
Hawk_v3
6d4ec50e08 Merge remote-tracking branch 'upstream/master' 2019-09-01 19:02:01 +01:00
Heroman
daf17316e5 Earlyports some fixes 2019-09-01 14:57:29 +10:00
Unknown
aa2a3682b9 Merge remote-tracking branch 'VOREStation/master' into medbeam 2019-08-31 15:32:22 -04:00
Unknown
bbf1fc1420 Recommended changes 2019-08-31 15:31:45 -04:00
Novacat
a000151fbf Merge pull request #5756 from Cameron653/Boot_fix 
Fixed an issue with multiple boot/shoe overlays.
 2019-08-31 15:05:06 -04:00
Novacat
502f9c79a6 Merge pull request #5755 from Rykka-Stormheart/shep-dev-minor-fixes 
Minor Bugfixes/Tweaks - Expedition-focused.
 2019-08-31 14:44:51 -04:00
Cameron Lennox
9f6e4df7eb Fixed an issue where boot/shoe overlays would magically be cleaned by putting in a knife and stepping on blood. 2019-08-31 14:41:24 -04:00
Rykka
a0f7577e96 Minor Bugfixes/Tweaks - Expedition-focused. 
Addresses V2 atmos tiles not allowing shots over them, and reduces charge/crank time for frontier phasers, as well as buffing them - you can reload while moving. QOL! <3
 2019-08-31 11:29:50 -06:00
Donut
964cc0e2c1 Musician.dm Fix 
The person who did the port from TG flipped the defines around. Whoops.
 2019-08-31 10:53:47 -04:00
Mewchild
54ec20f5fa Makes the pens comfy 2019-08-31 09:40:39 -05:00