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

23076 Commits

Author SHA1 Message Date
Unknown
6adf15a3ba More tweaks 2019-09-10 22:08:08 -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
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
Heroman
0ea9562a41 Applies requested changes 2019-09-08 10:45:13 +10:00
Heroman
8e0cdaae93 Fixes morph icon issue + verbs 2019-09-08 10:16:20 +10: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
Heroman
4f2b5558c4 Fixes deleting bellies ignoring cancelling 2019-09-06 04:39:34 +10: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
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
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
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
Heroman
8762c1f7b1 Fixes roiz tail clipping uniform off 2019-09-03 07:16:49 +10:00
Heroman
9e268d6191 Fixes bump-swapping for prometheans 2019-09-02 13:36:57 +10:00
Cyantime
eac30eb7e1 Gives Burrito their uniform back 2019-09-01 19:18:14 -04:00
Cyantime
b751e0e8bd Updates paths due to Polaris change 2019-09-01 18:24:35 -04:00
Heroman
beb228d6c4 Implements healbelly permission pref 2019-09-02 06:18:56 +10:00
Heroman
daf17316e5 Earlyports some fixes 2019-09-01 14:57:29 +10:00
Novacat
11c19e46ce Update human_attackhand.dm 2019-08-31 22:22:04 -04:00
Novacat
c53a08d938 Update human_attackhand.dm 2019-08-31 22:21:44 -04:00
Novacat
d1ec7415f5 Update human_attackhand.dm 2019-08-31 22:18:06 -04:00
Atermonera
725d42b10c glove attack refactor 2019-08-31 18:08:17 -04:00
Novacat
5eaebcf0df Merge pull request #5757 from Rykka-Stormheart/shep-dev-phaser-buff 
Buff Frontier Phasers by reducing charge time to sub-30 seconds.
 2019-08-31 17:21:08 -04:00
Novacat
ca6c795661 Update custom_guns_vr.dm 2019-08-31 17:07:30 -04:00
Rykka
ae2086b288 Updates as per review. 2019-08-31 15:01:00 -06:00
Rykka
a51070d192 Fix var/phase_power defined twice 2019-08-31 14:34:00 -06:00
Rykka
86a4b20a36 Updated values as per Novacat's Review 2019-08-31 14:31:18 -06:00
Unknown
aa2a3682b9 Merge remote-tracking branch 'VOREStation/master' into medbeam 2019-08-31 15:32:22 -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