cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,678 Commits 55 Branches 0 Tags
f6e07cf824169e837048bea3d0cd461d37f5974c
Commit Graph

159 Commits

Author SHA1 Message Date
CitadelStationBot
32300086d5 [MIRROR] Port material containers to datum components (#2562) 
* Port material containers to datum components

* Fixes Rej
 2017-09-04 04:08:42 -05:00
LetterJay
78ed8f0913 Fixes mecha drill not working on windoors. 2017-09-02 05:35:36 -05:00
kevinz000
ae59532c0d Merge pull request #2552 2017-08-29 22:38:30 -07:00
CitadelStationBot
605963d45c AltClick Improvements 2017-08-29 17:15:12 -05:00
kevinz000
301a581e64 sync 2017-08-29 09:41:11 -07:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
LetterJay
b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00
LetterJay
a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
CitadelStationBot
b5e7f7f7fe [MIRROR] Adds defines for mouse_opacity (#2381) 
* Adds defines for mouse_opacity

* Delete misc.dm.rej

* Update misc.dm
 2017-08-21 20:29:37 -07:00
CitadelStationBot
4961966552 |SPECIES FOOD PREFERENCES| (#2232) 
* Species food preferences

* sync

* Update humans.dm

* FUCK PUBBY
 2017-08-21 20:23:30 -07:00
CitadelStationBot
87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot
4686340d3c Fixes help text for embedded objects 2017-08-11 02:47:05 -05:00
CitadelStationBot
f8371a4fbe Fixes telekinesis not leaving admin fingerprints (#2264) 2017-08-05 10:20:55 -07:00
CitadelStationBot
d4f15ff6da [MIRROR] Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use (#2039) 
* Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use

* Fixes beam rifle indent error

* Projectile target check hit code now uses a proc for resharing

* Update beam_rifle.dm

* Delete beam_rifle.dm.rej

* Changes clickcatcher to dynamically scale based on view range rather than making 1 tile for each tile viewed

* Update turf.dm

* Update turf.dm

* Delete click.dm.rej

* Update click.dm

* fxies

* woops

* Update turf.dm

* the actual rifle

* dumb clickcatcher

* actions
 2017-08-03 06:12:27 -07:00
CitadelStationBot
91a44d4c35 Makes cyborg remote interaction limited. (#2230) 2017-08-03 06:02:15 -07:00
CitadelStationBot
55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
kevinz000
bbcad2fa58 Proper mirror PR for the disease refactor because I fucked up the first one. (#2026) 
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)"

This reverts commit 44742cb115.

* Delete shuttle_loan.dm.rej

* Delete life.dm.rej

* Update life.dm

* Delete life.dm.rej

* compile
 2017-07-31 23:41:22 -07:00
LetterJay
af581f8ab1 Merge pull request #2065 from Citadel-Station-13/upstream-merge-29280 
[MIRROR] Refactor Lung Handling
 2017-07-31 15:37:41 -05:00
LetterJay
35fba1933e Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304 
[MIRROR] Made some object lists less terrible to read
 2017-07-31 03:43:03 -05:00
CitadelStationBot
d7e66b7a3a You can now control-click action buttons to lock them in place 2017-07-24 17:05:41 -05:00
CitadelStationBot
1ebdf19cdb Refactor Lung Handling 2017-07-18 09:59:09 -05:00
CitadelStationBot
a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
deathride58
d21260d480 Makes arousal meter invisible when arousal is disabled (#2028) 
* makes arousal meter invisible when arousal is disabled

* sets the appearance of the arousal meter when the hud is generated

* hm

* hopefully fixed

* cmon

* okay NOW it works. it 100% works
 2017-07-17 22:50:52 -07:00
CitadelStationBot
62180f8953 ClickCross now uses CanPass instead of density directly. (#2016) 2017-07-15 11:44:36 -07:00
kevinz000
44742cb115 im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025) 
* Revert "Automatic changelog generation for PR #2021 [ci skip]"

This reverts commit 9d0cd37dd3.

* Revert "Disease Refactor (#2021)"

This reverts commit f2ac487927.
 2017-07-15 11:41:36 -07:00
CitadelStationBot
f2ac487927 Disease Refactor (#2021) 2017-07-15 11:40:49 -07:00
CitadelStationBot
7c4b887551 Clockwork component icons for tgui will only be generated once (#1995) 2017-07-14 03:21:13 -07:00
CitadelStationBot
4796ede787 Adds Necropolis curses for cursed items in Necropolis ruins 2017-07-06 10:15:09 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
kevinz000
6e2bd5fef5 Update click.dm 2017-07-03 15:45:19 -07:00
CitadelStationBot
72e7632fa8 [s] Fixes TK remote grab exploit 2017-06-25 07:41:23 -05:00
LetterJay
f668021230 commit 2017-06-19 17:33:40 -05:00
LetterJay
9332353714 update 2017-06-19 17:31:00 -05:00
LetterJay
866a569e41 dmi to png 2017-06-19 17:28:06 -05:00
LetterJay
12055144e4 fix it 2017-06-19 16:09:16 -05:00
LetterJay
c1af381233 Merge pull request #1460 from Citadel-Station-13/upstream-merge-28142 
[MIRROR] Adds another parallax layer
 2017-06-14 08:55:44 -05:00
LetterJay
4c1b223248 Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync 
Selective mirror sync
 2017-06-14 06:41:01 -05:00
CitadelStationBot
97005222ff Blood Cult Nerf: Restricted Nar-Sie summoning locations (#1479) 2017-06-13 13:48:49 -07:00
CitadelStationBot
811a25a3bb Makes game world plane use client color 2017-06-13 07:13:39 -05:00
LetterJay
87ce1e1780 upstream-merge-28047 2017-06-11 08:39:38 -05:00
LetterJay
f5f4e3a9d1 upstream-merge-28047 2017-06-11 08:26:09 -05:00
LetterJay
b80a184d97 up to upstream-merge-27868 2017-06-11 00:04:00 -05:00
CitadelStationBot
cb15acf8b2 Adds another parallax layer 2017-06-07 14:18:39 -05:00
CitadelStationBot
4cc3f81b3e Moves attack chain proc from global to obj/item 2017-05-26 11:12:09 -05:00
LetterJay
34f82efdd7 mind over matter 2017-05-24 08:30:23 -05:00
LetterJay
fe9c47650f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27495 2017-05-24 08:26:40 -05:00
LetterJay
34e74a377e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27442 2017-05-24 08:06:53 -05:00
LetterJay
e34bed049f Merge branch 'master' into upstream-merge-27495 2017-05-24 08:00:10 -05:00