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
53,131 Commits 8 Branches 0 Tags
273f7540b6448ab8db42d72d73cee1a2743a4d24
Commit Graph

38077 Commits

Author SHA1 Message Date
Aronai Sieyes
96fdb74232 Merge pull request #8040 from VOREStation/Arokha/fastwarn 
Warn VPN connectors better
 2020-05-22 21:13:40 -04:00
Aronai Sieyes
bd6391053e Merge pull request #8041 from VOREStation/upstream-merge-7127 
[MIRROR] Eris Research/Machine Sprite Port
 2020-05-22 21:13:31 -04:00
Aronai Sieyes
bcb314813d Merge upstream PR 2020-05-22 20:57:18 -04:00
Aronai Sieyes
c7502996f4 Merge upstream PR 2020-05-22 20:55:32 -04:00
Killian
53196b1179 [Project] Vintage Voidsuits 2020-05-22 20:38:11 -04:00
Atermonera
e7af0b2587 New janicart sprites/features 2020-05-22 20:37:49 -04:00
Cerebulon
4768d6b15a Eris Research/Machine Sprite Port 2020-05-22 20:36:34 -04:00
Aronai Sieyes
f535ee89f3 Warn VPN connectors better 2020-05-22 20:11:02 -04:00
Aronai Sieyes
eb20a1a6ba Tweak PAN cards 2020-05-22 20:01:28 -04:00
Aronai Sieyes
87216e21de Merge pull request #8026 from VOREStation/upstream-merge-7226 
[MIRROR] Fixes runtime in ticker.dm, 411: Cannot read null.mobtype
 2020-05-22 16:29:28 -04:00
Aronai Sieyes
c731db728e Merge pull request #8036 from VOREStation/Arokha/issue8035 
Add safety to GPSes to avoid runtimes
 2020-05-22 16:29:15 -04:00
Aronai Sieyes
f4e981c80d Merge pull request #8031 from VOREStation/Arokha/drillcell2 
Actually fix drill cells for real this time
 2020-05-22 16:27:49 -04:00
Aronai Sieyes
f9f380a280 Merge pull request #8032 from VOREStation/Arokha/ghosttip 
Add missing ghost teleport tooltip
 2020-05-22 16:27:37 -04:00
Aronai Sieyes
99d7183309 Merge pull request #8034 from VOREStation/Arokha/previewclick 
Click background in character preview to change it
 2020-05-22 16:27:27 -04:00
Aronai Sieyes
0ee3fae14d Merge pull request #8029 from KasparoVy/a-well-cooked-meal 
Refactors Ore Eating to Allow the Consumption of Material Sheets
 2020-05-22 16:27:15 -04:00
KasparoVy
fd665ed938 Amend Nomenclature for Clarity & Consistency 
Opted to leave the trait datum type and name for the sake of reference & mild humour.
 2020-05-22 12:12:32 -04:00
Aronai Sieyes
b9bdd25a3a Add safety to GPSes to avoid runtimes 2020-05-22 11:29:11 -04:00
Aronai Sieyes
67a5ead927 Click background in character preview to change it 2020-05-22 11:07:43 -04:00
Aronai Sieyes
377766b21f Add missing ghost teleport tooltip 2020-05-22 10:32:30 -04:00
Aronai Sieyes
448a210929 Actually fix drill cells for real this time 2020-05-22 09:57:46 -04:00
Aronai Sieyes
1b2b6398ba Merge upstream PR 2020-05-22 09:33:17 -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
KasparoVy
1a5bdf4e98 Refactors Ore Eating to Allow the Consumption of Material Sheets 
Refactors ore eating to facilitate the ethical consumption of refined materials, easily obtainable on station. Suggested by the kobolds.

Also fixes the material name of Plastitanium glass throughout the codebase.
 2020-05-22 03:55:04 -04:00
Aronai Sieyes
b7605d443c Update transform_procs.dm 2020-05-21 23:44:11 -04:00
Atermonera
8804f6de95 Fixes runtime in ticker.dm, 411: Cannot read null.mobtype 2020-05-21 23:29:20 -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