cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,764 Commits 6 Branches 0 Tags
2c409ca75422cd3f25a33c6e2026d2f003fee790
Commit Graph

710 Commits

Author SHA1 Message Date
Nadyr
a74d6c1703 powder that makes you say yes 2021-05-27 19:07:48 -04:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Chompstation Bot
e432a9e7ac Add portable mapping devices 2021-05-22 19:26:57 +00:00
Aronai Sieyes
bc6564deb6 Merge pull request #10335 from VOREStation/Arokha/dels 
Various qdel helpers
 2021-05-20 19:05:42 +00:00
Nadyr
b8902367c6 Merge pull request #1896 from CHOMPStationBot/upstream-merge-10243 
[MIRROR] Personal crafting & Dependencies
 2021-05-11 23:10:42 -04:00
Nadyr
4c384b2861 Merge pull request #1929 from CHOMPStationBot/upstream-merge-10286 
[MIRROR] Adds subsystem crash logging to SSprocess and SSmobs
 2021-05-11 23:10:20 -04:00
Chompstation Bot
d7f20396de Personal crafting & Dependencies 2021-05-11 22:43:33 -04:00
Novacat
866824fa85 Merge pull request #10280 from VOREStation/Arokha/multiore 
Allow more than one ore processor
 2021-05-11 13:06:25 +00:00
Novacat
1358ad8867 Merge pull request #10286 from VOREStation/Arokha/SSabandonship 
Adds subsystem crash logging to SSprocess and SSmobs
 2021-05-11 13:05:58 +00:00
Chompstation Bot
36db9dad68 Fixes traits not getting applied properly. 2021-04-12 14:34:01 +00:00
Nadyr
b29050d476 Merge branch 'master' into upstream-merge-10105 2021-04-11 06:29:26 -04:00
Nadyr
8ad86ed1f8 Merge branch 'master' into upstream-merge-10033 2021-04-11 04:45:06 -04:00
Chompstation Bot
b421878f3f Fixes Traits 2021-04-09 01:21:15 +00:00
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00
Chompstation Bot
43072b15c2 Trait Rebalance and Refactor 2021-04-07 19:40:58 +00:00
Nadyr
81d55a1cb2 Merge pull request #1682 from MisterGrimm/Genaprawns 
Player Xenomorph Overhaul 1.1 , the Genaprawns
 2021-03-28 21:53:36 -04:00
Nadyr
4a8c021ea4 Update global_lists_vr.dm 2021-03-28 00:27:49 -04:00
Sym
8ca11f0439 Changing player Xenomorphs to Genaprawns 2021-03-26 19:42:08 -04:00
Chompstation Bot
8db3a020a0 Micro March beta update. 2021-03-26 23:23:02 +00:00
Nadyr
a85ee7115f Merge branch 'master' into upstream-merge-9924 2021-03-21 03:35:47 -04:00
Nadyr
48d8812b9e Update global_lists_vr.dm 2021-03-21 02:00:04 -04:00
Nadyr
95a2350221 Update global_lists.dm 2021-03-21 01:24:14 -04:00
Chompstation Bot
2a5c21c8f5 [MIRROR] Kaleidoscope 2: The Retabbening 2021-03-21 01:24:14 -04:00
Chompstation Bot
006cc9fa0e Fixes Custom Species Base Selection 2021-03-12 05:25:32 +00:00
Novacat
6af8ca393b Merge pull request #9900 from VOREStation/upstream-merge-7958 
[MIRROR] Fixes context-menu examine expanding incorrect target
 2021-03-10 19:46:45 +00:00
Novacat
1d0ca9dd1e Merge pull request #9867 from VOREStation/upstream-merge-7928 
[MIRROR] Added a GPS compass.
 2021-03-09 22:59:48 +00:00
Novacat
955be2e5fe Merge pull request #9876 from VOREStation/upstream-merge-7953 
[MIRROR] Fixed/generalized loadout implants.
 2021-03-08 16:53:20 +00:00
cadyn
fc25da825e Revert "Fix ghost double comms with new link allinone" 2021-03-05 14:00:51 -08:00
Razgriz
01fc087eeb Merge pull request #1460 from CHOMPStation2/cadyn-patch-9 
Fix bullets I guess
 2021-03-04 02:15:20 -07:00
Cadyn
7cae69b7c9 Fix ghost double comms with link allinone 2021-03-03 23:39:03 -08:00
cadyn
067fbe283d Update mobs.dm 2021-02-28 19:33:10 -08:00
cadyn
b4d1f6d520 Fix bullets I guess 2021-02-28 19:23:38 -08:00
Nadyr
553c26bde2 Merge pull request #1427 from CHOMPStationBot/upstream-merge-9793 
[MIRROR] Silky, silky webs. Adds Weaver trait, with ability to weave spiderwebs and more!
 2021-02-28 08:08:43 -05:00
cadyn
a815e7b384 Update global_lists.dm 2021-02-27 13:23:03 -08:00
Chompstation Bot
dbc2902fc1 Steals and fixes a memory leak fix from the freeloaders 2021-02-27 15:06:52 +00:00
Chompstation Bot
d11ff04c30 Silky, silky webs. Adds Weaver trait, with ability to weave spiderwebs and more! 2021-02-26 21:41:34 +00:00
Razgriz
fdf4277123 Citadel Mirror: fixes a pretty horrific memory leak 
This fix is taken from citadel station pr #2779. Fixes a "pretty horrific memory leak" that is called any time someone opens character creator.
 2021-02-25 17:09:11 -07:00
Cadyn
3995353b03 Bot cleanup and config 
Cleaning my code up and adding stuff to config
 2021-02-24 16:05:49 -08:00
Cadyn
51ce2042af Faxes and ahelps admin channel changes 2021-02-24 13:36:31 -08:00
Cadyn
bbb338edba Auto stash before merge of "tgs4" and "origin/master" 2021-02-23 03:02:32 -08:00
Chompstation Bot
653d2b9179 Communicator UI Improvements + Camera Console Moving Camera Fixes (rebundled) 2021-02-14 08:51:59 -05:00
Nadyr
39292dfe36 Merge pull request #1291 from CHOMPStationBot/upstream-merge-9676 
[MIRROR] Adds in 1 new eggs end 3 joke eggs.
 2021-02-14 07:33:01 -05:00
Razgriz
aaee7ed0fd Merge pull request #1214 from kcin2001/trash-eat-bots 
Synths get a special list of Trash eat items and add a few items to normal trash eat
 2021-02-11 22:39:44 -07:00
Verkister
113bf6356a Merge pull request #9676 from H0lySquirr3l/master 
Adds in 1 new eggs end 3 joke eggs.
 2021-02-11 10:59:20 +00:00
Razgriz
9760ad2b36 Revert #1238 
Revert #1238 SQL ReturnlessQuery()
 2021-02-07 17:34:25 -07:00
Razgriz
c446790d4f Merge pull request #1234 from cadyn/ballistics-v4 
Ballistics v4
 2021-02-06 22:59:44 -07:00
Cadyn
aee6b61ffb added and implemented ReturnlessQuery() 2021-02-04 17:58:40 -08:00
Razgriz
14c7fcfef1 Merge branch 'master' into trash-eat-bots 2021-02-04 14:26:50 -07:00
Cadyn
d93a3dac65 Ballistics v4 2021-02-04 01:56:16 -08:00
Chompstation Bot
d3c7cc6040 New advanced Egg Release mechanics. 2021-02-01 19:35:41 +00:00