cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-30 03:05:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,614 Commits 9 Branches 0 Tags
dedb854338a2cc0d41b9b2207cfb12cd4e23f556
Commit Graph

25739 Commits

Author SHA1 Message Date
ShadowLarkens
dedb854338 Fixes emergent exploit of iteration order in crew monitors 2020-08-30 19:05:05 -07:00
Novacat
d10cb4aed1 Merge pull request #8913 from Heroman3003/datefix 
Changes the dates of bank account creation to be more reasonable
 2020-08-30 17:14:02 -04:00
Novacat
197d6d347f Merge pull request #8921 from lbnesquik/Kot-nif 
Improve quick nif
 2020-08-30 17:13:06 -04:00
Novacat
1abe8718e5 Merge pull request #8915 from VOREStation/upstream-merge-7579 
[MIRROR] Makes borg cell replacement take priority over petting
 2020-08-30 15:29:47 -04:00
Novacat
ac15f36943 Update robot.dm 2020-08-30 14:59:10 -04:00
lbnesquik
196580141b Improve quick nif 
You can now choose which nif you want to give them
 2020-08-30 20:53:23 +02:00
Heroman3003
8174488f34 Makes borg cell replacement take priority over petting 2020-08-30 02:50:16 -04:00
Cerebulon
7c57c7c0bd Vendor enhancement fixes (#7577) 
* Vendor enhancement fixes

* skrellsnax trash, tuna name
 2020-08-30 02:49:00 -04:00
Heroman
17d681c109 Changes the dates of bank account creation to be more reasonable 2020-08-30 13:57:21 +10:00
MrSign
f490bec8e2 adds toeless jackboots to loadout 2020-08-30 09:15:16 +10:00
MrSign
e0486dc479 Update loadout_shoes.dm 2020-08-30 09:00:50 +10:00
Heroman
c3bf4e5220 Makes rabbits not be vulpines 2020-08-30 05:32:23 +10:00
Novacat
692afaef75 Merge pull request #8794 from KasparoVy/mane-gain 
Lets Taj Hairstyles be Selected by More Species
 2020-08-28 16:11:57 -04:00
Novacat
81967dff01 Merge pull request #8887 from Heroman3003/xenobotany-remember 
Allows xenobotanist to actually take research's loadout items.
 2020-08-28 16:08:02 -04:00
Heroman
0a496c40ad Allows xenobotanist to actually take research's loadout items. 2020-08-29 05:31:01 +10:00
Heroman
ffdd8de3ce Site Management lookover for _vr stuff 2020-08-29 05:22:52 +10:00
Novacat
9bf1483963 Merge pull request #8846 from ShadowLarkens/tgui_silicon_law_panel 
TGUI Law Manager
 2020-08-28 14:48:01 -04:00
Novacat
0e1c17293e Merge pull request #8883 from Novacat/nova-basicfixes 
Some quick fixes
 2020-08-28 14:47:39 -04:00
ShadowLarkens
eac9e46615 TGUI Law Manager 2020-08-28 11:36:47 -07:00
Unknown
5be8cac469 Some quick fixes 
- Fixes pathing error for ship capsules
- Adds a decal to all capsules
- Updates the Military capsule a bit
- Fixes a pathing error in an underdark POI
 2020-08-28 14:36:16 -04:00
Rykka
898f6d9d0b Adds Destructive Analyzer Sounds to Destructive Analyzing 2020-08-28 14:14:48 -04:00
Novacat
61a961a512 Merge pull request #8878 from VOREStation/upstream-merge-7576 
[MIRROR] Replace "Sleeping Agent" with Nitrous Oxide, Add New Sprites for Gases
 2020-08-28 13:50:49 -04:00
Novacat
762f655b59 Merge pull request #8873 from VOREStation/upstream-merge-7559 
[MIRROR] Ladders respect Move Up/Down paradigm
 2020-08-28 13:35:11 -04:00
Unknown
10ca73bc6e Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7576 2020-08-28 13:30:54 -04:00
Novacat
7a01fd75f5 Update supermatter_monitor.dm 2020-08-28 13:28:03 -04:00
Novacat
28c19ee066 Merge pull request #8868 from VOREStation/upstream-merge-7571 
[MIRROR] Colony Director -> Site Manager
 2020-08-28 13:17:58 -04:00
Novacat
bd4d0e78d4 Merge pull request #8833 from VOREStation/upstream-merge-7456 
[MIRROR] The great Aurora shoe heist
 2020-08-28 13:04:33 -04:00
Novacat
25058122bf Merge pull request #8826 from VOREStation/upstream-merge-7555 
[MIRROR] Actually adds (and TESTS) exclude_mobs parameter to visible_message
 2020-08-28 13:02:03 -04:00
Novacat
180e265744 Merge pull request #8855 from VOREStation/upstream-merge-7548 
[MIRROR] Xenoarchaeology Upkeep
 2020-08-28 13:01:47 -04:00
Novacat
dedbb71ccf Update structures.dm 2020-08-28 12:59:17 -04:00
Novacat
9ac3f02519 Update movement.dm 2020-08-28 12:58:04 -04:00
Novacat
40396ef8d7 Update Dreaming.dm 2020-08-28 12:52:12 -04:00
Novacat
33b1eb1cdb Update mob.dm 2020-08-28 12:38:16 -04:00
Novacat
f6e61ea8f1 Merge pull request #8658 from Rykka-Stormheart/shep-dev-ambience-additions 
Massive Ambience and Sound Overhaul + Addition
 2020-08-28 00:47:23 -04:00
Novacat
46ae945283 Merge pull request #8871 from VOREStation/upstream-merge-7575 
[MIRROR] Make it so beer bottles are filled. No longer get scammed!
 2020-08-28 00:21:41 -04:00
Novacat
4e2038b9c0 Merge pull request #8863 from VOREStation/upstream-merge-7565 
[MIRROR] Fix ventcrawling while in 0 gravity
 2020-08-28 00:19:02 -04:00
Novacat
b01633b67e Merge pull request #8860 from VOREStation/upstream-merge-7558 
[MIRROR] Returns the jackolantern overlay
 2020-08-28 00:18:18 -04:00
Novacat
e370fda424 Merge pull request #8859 from VOREStation/upstream-merge-7554 
[MIRROR] Fixes turf slowdown not applying on non-water/snow turfs
 2020-08-28 00:17:58 -04:00
Novacat
2dabf37c56 Merge pull request #8857 from VOREStation/upstream-merge-7553 
[MIRROR] [Untested] Emotes won't be foiled by pesky capitals
 2020-08-28 00:17:36 -04:00
Novacat
f412e7555f Merge pull request #8856 from VOREStation/upstream-merge-7550 
[MIRROR] Fix combinination_cook() creating items with no reagents
 2020-08-28 00:17:18 -04:00
Novacat
5841a011a9 Merge pull request #8854 from VOREStation/upstream-merge-7480 
[MIRROR] Ports Aurora Diona markings
 2020-08-28 00:16:56 -04:00
Atermonera
57bc515c04 Replace "Sleeping Agent" with Nitrous Oxide, Add New Sprites for Gases 2020-08-27 22:28:46 -04:00
Atermonera
4acd8a7a87 Merge pull request #7584 from Rykka-Stormheart/shep-dev-borgo-fixes 
Reverts #7560, Adds Proper check to syringes.dm and flora.dm for borgs
 2020-08-27 21:45:33 -04:00
Atermonera
f2f5ba7a9e Ladders respect Move Up/Down paradigm 2020-08-27 21:39:06 -04:00
Atermonera
f426b13bde Merge pull request #7575 from lbnesquik/Kot-Beer-IS-FOR-MEN 
Make it so beer bottles are filled. No longer get scammed!
 2020-08-27 21:31:30 -04:00
Atermonera
21c1b12ef1 Colony Director -> Site Manager 2020-08-27 20:43:04 -04:00
Atermonera
109fc5259c Merge pull request #7565 from Cyantime/patch-1 
Fix ventcrawling while in 0 gravity
 2020-08-27 20:36:48 -04:00
Atermonera
f0bfa69416 Merge pull request #7558 from Cyantime/lanternlight 
Returns the jackolantern overlay
 2020-08-27 19:58:53 -04:00
Atermonera
de5d1f6120 Merge pull request #7554 from Heroman3003/turfslow 
Fixes turf slowdown not applying on non-water/snow turfs
 2020-08-27 19:57:37 -04:00
Atermonera
5ea4c84700 Merge pull request #7553 from Shadow-Quill/patch-1 
[Untested] Emotes won't be foiled by pesky capitals
 2020-08-27 19:47:44 -04:00