cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-29 11:32:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,870 Commits 6 Branches 0 Tags
b9bdd25a3a5c35c9defb0989fd92cc22c15dbfbb
Commit Graph

37905 Commits

Author SHA1 Message Date
Aronai Sieyes
b9bdd25a3a Add safety to GPSes to avoid runtimes 2020-05-22 11:29:11 -04:00
Aronai Sieyes
70251e83f9 Merge pull request #8023 from VOREStation/Verkister-patch-1 
Fixes micro holder hug spam.
 2020-05-22 09:27:17 -04:00
Aronai Sieyes
b7605d443c Update transform_procs.dm 2020-05-21 23:44:11 -04:00
Atermonera
369eba1450 Fixes runtime in AI generation 2020-05-21 23:28:05 -04:00
Verkister
474455140f Fixes micro holder hug spam. 
This is why we can't have nice things.
 2020-05-22 03:44:02 +03:00
Leshana
fb532ac920 Refactor Character Setup to use MAP 
- Instead of using expensive getFlatIcon() calls, character previews are now shown using screen objects in a second map window.
- Edited skin to add a named window for preferences setup that contains a browser plus a new map window to show the previews.
- Mannequins are still generated the same way, but now a MA is applied to four screen objects which are shown in the second map window.
- The screen objects are deleted on close of the preferences window.  So we do make sure to close it when spawning.
 2020-05-21 19:04:56 -04:00
Aronai Sieyes
7ebe2d6bae Merge pull request #8019 from VOREStation/Arokha/issue7846 
Show "general" flavortext on AI holo examine
 2020-05-21 16:08:23 -04:00
Aronai Sieyes
06a733e680 Merge pull request #8014 from VOREStation/upstream-merge-7184 
[MIRROR] adds some coats for teshari + fancy clothes
 2020-05-21 16:07:42 -04:00
Aronai Sieyes
9af470047e Merge pull request #8013 from VOREStation/upstream-merge-7183 
[MIRROR] Swarm Balancing Upkeep
 2020-05-21 16:07:29 -04:00
Aronai Sieyes
b73b898e26 Merge pull request #8010 from VOREStation/upstream-merge-7180 
[MIRROR] Fix weeds
 2020-05-21 16:06:26 -04:00
Aronai Sieyes
6483a18b6a Merge pull request #8007 from VOREStation/upstream-merge-7172 
[MIRROR] Hybrid tools buffs.
 2020-05-21 16:05:32 -04:00
Aronai Sieyes
22fe3bd4e4 Merge pull request #8002 from VOREStation/upstream-merge-7138 
[MIRROR] Updates Solgov/Sifguard uniforms
 2020-05-21 16:03:58 -04:00
Aronai Sieyes
6319769ddd Merge pull request #8001 from VOREStation/upstream-merge-7206 
[MIRROR] Allows you to toggle off Byond/Discord/URLs in OOC
 2020-05-21 16:01:50 -04:00
Aronai Sieyes
1bd327ce1e Merge upstream PR 2020-05-21 15:48:02 -04:00
Aronai Sieyes
62c3bdd2e7 Merge upstream PR 2020-05-21 15:43:40 -04:00
Aronai Sieyes
35c0fa2103 Merge pull request #8000 from VOREStation/Arokha/issue7803 
Fix rollerbed movement with buckled mobs
 2020-05-21 15:40:27 -04:00
Aronai Sieyes
58d9b0a6fb Merge pull request #7999 from VOREStation/Arokha/issue7657 
Fix sinks washing things at a distance
 2020-05-21 15:40:03 -04:00
Aronai Sieyes
af2a4cb216 Merge pull request #7998 from VOREStation/Arokha/issue7927 
Tweak beartraps, alerts
 2020-05-21 15:39:47 -04:00
Aronai Sieyes
2b461336aa Merge pull request #7997 from VOREStation/Arokha/qipaodesc 
Add qipao description
 2020-05-21 15:39:25 -04:00
Aronai Sieyes
abc2468239 Merge pull request #7996 from VOREStation/Arokha/issue7930 
Alleviate shapeshifter color issues
 2020-05-21 15:39:00 -04:00
Aronai Sieyes
0ef3499812 Merge pull request #7995 from VOREStation/Arokha/issue7982 
Fix carp subtypes without vore sprites becoming invisible
 2020-05-21 15:38:49 -04:00
Aronai Sieyes
9516e47586 Merge pull request #7994 from VOREStation/Arokha/issue7766 
Fix mining drill cell size
 2020-05-21 15:38:33 -04:00
Aronai Sieyes
c8d56479c8 Merge pull request #7993 from VOREStation/Arokha/issue6269 
Fixes smartfridge throw stock issue
 2020-05-21 15:38:15 -04:00
Aronai Sieyes
6cc7245329 Copy "general" flavortext from character setup to AI hologram 2020-05-21 15:19:02 -04:00
Atermonera
20e8eb5b05 Merge pull request #7184 from Greenjoe12345/teshycoats 
adds some coats for teshari + fancy clothes
 2020-05-21 14:42:32 -04:00
Atermonera
2b702e3a26 Merge pull request #7183 from Mechoid/SwarmPylonUpkeep 
Swarm Balancing Upkeep
 2020-05-21 14:41:18 -04:00
Atermonera
69fc5d6a3b Merge pull request #7180 from Mechoid/FixWeeds 
Fix weeds
 2020-05-21 14:37:34 -04:00
Atermonera
b82b05409f Merge pull request #7172 from lolman360/hyBRO-tools 
Hybrid tools buffs.
 2020-05-21 14:32:45 -04:00
Novacat
872bc17937 Updates Solgov/Sifguard uniforms 2020-05-21 14:21:19 -04:00
Atermonera
0c200c9483 Allows you to toggle off Byond/Discord/URLs in OOC 2020-05-21 14:20:05 -04:00
Aronai Sieyes
a8ac98b623 Fix rollerbed movement with buckled mobs 2020-05-21 14:06:59 -04:00
Aronai Sieyes
c6b4eddefb Fix sinks washing things at a distance 2020-05-21 13:08:11 -04:00
Aronai Sieyes
35eaa9b40a Add more screen alert types 2020-05-21 12:38:18 -04:00
Aronai Sieyes
bf3bdbf0e1 Traps don't get weird with removed limbs 2020-05-21 12:38:10 -04:00
Aronai Sieyes
0fe760d58f Add qipao description 2020-05-21 12:07:01 -04:00
Aronai Sieyes
61ae4f886c Shapeshifter color selection knows default/current 2020-05-21 11:59:54 -04:00
Aronai Sieyes
d8af99afc4 VS: Protean single limb refactor color fix 2020-05-21 11:59:40 -04:00
Aronai Sieyes
5d1b0df9d0 Fix carp subtypes without vore sprites becoming invisible 2020-05-21 11:43:12 -04:00
Aronai Sieyes
264a8340c1 Can map in cell'd mining drills using the /loaded subtype 2020-05-21 11:31:00 -04:00
Aronai Sieyes
1bf4a11207 Fixes smartfridge throw stock issue 2020-05-21 11:24:45 -04:00
Aronai Sieyes
1c816a9bdd Antagonist options for new events not saving with slot? 
Fixes #7743
 2020-05-21 11:09:28 -04:00
Aronai Sieyes
3237ae96d7 Merge pull request #7987 from VOREStation/Arokha/talks 
Talking changes
 2020-05-20 16:09:40 -04:00
Aronai Sieyes
9ead81ca31 Merge pull request #7988 from VOREStation/Arokha/protfixes 
Make protean deaths a bit more robust
 2020-05-20 16:09:29 -04:00
Aronai Sieyes
b7af757171 Merge pull request #7981 from VOREStation/upstream-merge-7193 
[MIRROR] Edit Appearance and Change Appearance update icon sex
 2020-05-20 16:09:18 -04:00
Aronai Sieyes
e110f42275 Merge pull request #7978 from KillianKirilenko/kk-misc 
Talon Crew Unique Voidsuits
 2020-05-20 16:01:30 -04:00
Aronai Sieyes
ab70f3fb1a Update appearance.dm 2020-05-20 15:55:48 -04:00
Aronai Sieyes
8ac6628b35 Merge pull request #7980 from VOREStation/upstream-merge-7196 
[MIRROR] Fixes runtime in ravenous_macrophage.dm, line 26: Cannot read null.mind
 2020-05-20 15:48:06 -04:00
Aronai Sieyes
4d254bb8fc Fix protean deaths 2020-05-20 13:54:55 -04:00
Aronai Sieyes
1a3f9cc3ee General fixes 2020-05-20 13:54:49 -04:00
Aronai Sieyes
131ac8fc60 VS: Chatter 
Lower speech bubble when in belly
 2020-05-20 13:52:33 -04:00