cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,072 Commits 8 Branches 0 Tags
6adf15a3ba2718ab370c34b13a28712471dbaa03
Commit Graph

35136 Commits

Author SHA1 Message Date
Unknown
6adf15a3ba More tweaks 2019-09-10 22:08:08 -04: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
8243407fac Merge pull request #5813 from Rykka-Stormheart/shep-dev-hostile-maint-drone 
Corrupt Maintenance Drone
 2019-09-09 21:02:07 -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
Rykka
afd054ecf7 Moves Corrupt Drone icons to robots_vr and corrects filepath 2019-09-09 18:27:31 -06:00
Novacat
6d3649b718 Merge pull request #5832 from Heroman3003/amifix 
Adjusts RD's rigsuit
 2019-09-09 11:50:46 -04:00
Novacat
b24d039921 Update station_vr.dm 2019-09-09 11:33:30 -04:00
Unknown
6eb4e5eb82 Minor Init Fixes 
Should improve things a little.
 2019-09-09 10:03:56 -04:00
Heroman
06a852de48 Restricts RD's rig 2019-09-09 04:52:05 +10:00
Rykka
4cd780d19e Adds Corrupt Repairbot sprite and modifies the .dm to use it 
Takes changes suggested from PR and adds a "new" sprite - adds red eyes to the maint drone sprite, and renames it to corrupt maint drone. <3
 2019-09-08 03:21:45 -06:00
Novacat
fe1345df5f Merge pull request #5828 from VOREStation/upstream-merge-6446 
[MIRROR] Fixes solar panel assembly dupe
 2019-09-08 01:58:54 -04:00
Novacat
be01416ba5 Merge pull request #5822 from VOREStation/upstream-merge-6436 
[MIRROR] Fixed an issue with multiple boot/shoe overlays.
 2019-09-08 01:58:45 -04:00
Novacat
bf17ac5e22 Update clothing.dm 2019-09-07 23:40:39 -04:00
Atermonera
3c36be2390 Merge pull request #6446 from Heroman3003/solarfix 
Fixes solar panel assembly dupe
 2019-09-07 23:34:46 -04:00
Atermonera
e6cc80f0e9 Merge pull request #6445 from Heroman3003/lawfix 
Fixes some lost drone laws not ever applying
 2019-09-07 23:33:34 -04:00
Atermonera
153a7e118a Fixed an issue with multiple boot/shoe overlays. 2019-09-07 23:11:56 -04:00
Heroman
0ea9562a41 Applies requested changes 2019-09-08 10:45:13 +10:00
Novacat
3b741c6418 Merge pull request #5819 from Heroman3003/morfix2 
Fixes morph icon issue + verbs
 2019-09-07 20:29:00 -04:00
Heroman
8e0cdaae93 Fixes morph icon issue + verbs 2019-09-08 10:16:20 +10: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
Rykka
24cfc6064b Renamed to _vr.dm 2019-09-06 09:53:53 -06:00
Rykka
2fe3f64abe Adds Corrupt Maintenance Drone! <3 2019-09-06 09:38:08 -06: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
Novacat
63757598de Merge pull request #5810 from Heroman3003/vorepaneldelete 
Fixes deleting bellies ignoring cancelling
 2019-09-05 14:51:18 -04:00
Heroman
4f2b5558c4 Fixes deleting bellies ignoring cancelling 2019-09-06 04:39:34 +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
Novacat
625f108355 Merge pull request #5803 from Novacat/nova-pathfinder 
Replaces capsule liquidfoods with MREs
 2019-09-04 19:29:26 -04:00
Unknown
51c3daf585 Hardsuit Tweaks 
- Improves armor stats of Heavy Asset Protection hardsuits
- Enables PMC and Military hardsuits to equip backpacks on their suit slot
 2019-09-04 19:11:11 -04:00
Unknown
0397256a8d Sneaks in sleeper fix 2019-09-04 18:18:21 -04:00
Heroman
6f0952e921 Fixes SA_ICON_REST being a combination of living and dead too 2019-09-05 05:35:12 +10:00
Novacat
44e8229016 Merge pull request #5797 from Heroman3003/aifix 
Fixes slimes not resetting back to help intent after attacking
 2019-09-04 00:18:01 -04:00
Heroman3003
9667650148 Fixes slimes not resetting back to help intent after attacking 2019-09-04 10:12:54 +10: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
8259c32997 Merge pull request #5776 from MrSign/securitycargoimplant 
Added tracking + chemical implants to orderable security crate(s)
 2019-09-03 18:13:06 -04:00
Novacat
ff4f6824e6 Merge pull request #5777 from Heroman3003/bellyprefthing 
Implements healbelly permission pref
 2019-09-03 18:12:32 -04:00
Novacat
96226be304 Merge pull request #5781 from Cyantime/paths2 
Updates solgov paths due to Polaris change
 2019-09-03 18:11:54 -04:00
Novacat
ac841a8eb5 Merge pull request #5795 from Heroman3003/interceptiont 
Restricts AI intercepting messages
 2019-09-03 18:10:06 -04:00
Heroman
ee36015a0f Also restricts spam 2019-09-04 04:27:07 +10:00
Heroman
b3e01dc515 Restricts AI intercepting messages 2019-09-04 04:23:16 +10:00
Mewchild
0483a5771d Actually Defines new Pets. Runtime is no longer dirty 2019-09-03 02:07:49 -05: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
Cameron653
5b64c76c4c Adds an end to the VS edit 2019-09-03 01:47:30 -04:00
Cameron Lennox
e3073bbb5d Fixes the washing bug with boots 2019-09-03 01:34:54 -04:00
Novacat
db1c91d87d Merge pull request #5786 from Heroman3003/roizfix 
Fixes roiz tail clipping uniform off
 2019-09-02 17:32:16 -04:00