kappa-sama
c8cfd4e150
cursed
2020-01-22 16:52:28 -05:00
Ghommie
c14439494a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-12 19:18:03 +01:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
Ghommie
2c578ca683
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2019-10-24 18:01:46 +02:00
Ghommie
45adfd5bab
making it compile.
2019-09-20 23:20:44 +02:00
Ghommie
1f2c19c1da
ports "Resisting out of bucklecuffs takes an amount of time dependent on cuffs used", also toy handcuffs no longer demoralize the wearer.
2019-09-20 22:57:06 +02:00
Ghommie
de8137d6c8
One line fix for invisible zipties.
2019-08-06 23:19:28 +02:00
Ghommie
4ef1413342
dupe icons instead of snowflake vars.
2019-07-29 04:50:12 +02:00
Ghommie
2b224400e3
Adds in worn overlays for different types of cuffs.
2019-07-29 04:31:27 +02:00
Ghommie
d3d2b8d898
should be ready.
2019-06-06 19:24:20 +02:00
Poojawa
9b3dc9f81b
Removes snowflake cuffs add law speech for borg cuffs
2018-10-20 07:56:54 -05:00
Poojawa
8b9ef1e400
Game folder
2018-09-11 04:06:45 -05:00
deathride58
91805b8789
and that just leaves the modules folder
2018-07-02 00:28:51 -04:00
oranges
7d45e045a3
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
Poojawa
5fa001c10f
things with stuff ( #6233 )
...
* buncha things from upstream
* datums globals, onclick
* datums
* game folder, holy shit mirror bot why
* modules
* icons
* dme
* compiles cleanly
* tools purge
* updates maps
* double check just because. and wew lad
* incidentally, this needs more work first
* some things
* weh
* sound cleanup and icons
* reeeee
* compile issues
* oh look, fresh code sync
* cleans up some unused icons
* dirty vars
* reeeeeeeeeeeeeeee
* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
CitadelStationBot
3d26cd4a6f
[MIRROR] Replaced body zone magic strings with defines ( #6004 )
...
* Replaced body zone magic strings with defines
* merge conflicts
2018-03-19 21:18:57 -05:00
Jordan Brown
f9353da855
Quote the armor lists
2018-02-16 00:26:26 -06:00
oranges
d427e0174b
Merge pull request #35346 from DaxDupont/kinky-cuffs
...
Fixes cyborg related cuffing issues
2018-02-08 03:07:51 -06:00
Poojawa
03086dfa91
Tg 1 28 sync testing/confirmation ( #5178 )
...
* maps, tgui, tools
* defines and helpers
* onclick and controllers
* datums
fucking caught that hulk reversal too.
* game and shuttle modular
* module/admin
* oh god they fucking moved antag shit again
* haaaaate. Haaaaaaaaaate.
* enables moff wings
* more modules things
* tgstation.dme
before I forget something important
* some mob stuff
* s'more mob/living stuff
* some carbon stuff
* ayy lmaos and kitchen meat
* Human stuff
* species things
moff wings have a 'none' version too
* the rest of the module stuff.
* some strings
* misc
* mob icons
* some other icons.
* It compiles FUCK BORERS
FUCK BORERS
2018-01-29 04:42:29 -06:00
MrDoomBringer
4d206f56e8
Adds ~70 more suicides
2018-01-23 01:39:07 -06:00
deathride58
d8facb3bce
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
LetterJay
2e6b034493
save point - a lot of shit to fix
2017-12-27 07:03:40 -06:00
ShizCalev
3ea4e84719
Fixes deleting handcuffs ( #33821 )
...
* Fixes deleting handcuffs
* cleanup
2017-12-26 00:13:13 -06:00
Jordan Brown
164db7ae9b
Prefixed all disability defines with DISABILITY_ to fix a name collision
2017-12-24 15:03:30 -06:00
XDTM
3af0aa2489
[Ready Again]Refactors disabilities into lists, allowing for independent disability sources
2017-12-18 15:19:53 -06:00
LetterJay
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
vuonojenmustaturska
7f90427a40
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06:00
CitadelStationBot
cc0b768c72
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES ( #4014 )
...
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
2017-12-11 16:36:38 -08:00
Jordie
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
oranges
59f3a714e2
Merge pull request #32250 from ninjanomnom/map-cable-color
...
Makes greyscaled cables' color viewable in map editing
2017-10-31 15:30:45 -05:00
Emmett Gaines
ae86a75362
Greyscale cables
2017-10-25 21:46:57 -05:00
LetterJay
62d2b26c7a
Update handcuffs.dm
2017-10-07 22:49:52 -05:00
Jordan Brown
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
CitadelStationBot
2a860d1954
[MIRROR] More Initialize() fixes, requires someone to test with DB ( #2857 )
...
* More Initialize() fixes, requires someone to test with DB
* fucking mirror failure
2017-09-22 23:35:22 -05:00
kevinz000
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07:00
kevinz000
c638386507
Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. ( #2460 )
...
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
2017-08-24 21:07:58 -07:00
