fe17bee28e
reverts thing kev said about
2020-08-29 14:36:41 +08:00
b376a6b6c4
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-07-30 14:43:52 +08:00
8e177bf01e
another batch - MAJOR: teleportaiton, displaycase (ico port needed),
2020-07-24 19:58:48 +08:00
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
993b4ec222
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-16 19:39:46 -07:00
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
5b7d9a9008
Merge conflict fix
2020-05-13 12:37:18 +03:00
80b47ec1c0
Ports https://github.com/tgstation/tgstation/pull/50497
2020-04-23 09:55:28 +03:00
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
c3faf94d8f
WIP
2020-03-30 05:29:39 +02:00
bfb8139225
DefaultCombatknockdown
2020-02-25 03:18:37 -07:00
f6542b381c
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 23:29:25 -07:00
6a8a606f97
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-04 16:01:25 -07:00
a726f09201
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-04 03:54:52 +01:00
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
188f726ffd
unicode support port wip
2020-01-31 05:32:00 +01:00
7bcb37c5d1
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-16 21:12:56 -07:00
3e199ed780
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into modularer
2020-01-12 14:23:38 -05:00
4e3a5379a4
augh
2020-01-12 14:21:06 -05:00
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
eb93e3d1d3
hi
2020-01-11 12:35:04 -05:00
6ec3fde836
better-signalers
2020-01-10 18:06:55 +08:00
7378d91684
([\W\.])Knockdown\(
2020-01-06 03:39:20 -08:00
129ca9d71f
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
91805b8789
and that just leaves the modules folder
2018-07-02 00:28:51 -04:00
6a07a66cb3
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
7d45e045a3
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
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
d8facb3bce
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
aa020ea9e8
Update electropack.dm
2017-11-12 16:00:15 -06:00
de8e064e45
Update electropack.dm
2017-11-12 15:42:44 -06:00
1c8d9b3a4e
Update electropack.dm
2017-11-12 10:38:30 -06:00
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
fb60efeacb
Fixes shock collars getting stuck in pockets.
2017-10-09 22:45:02 -07:00
ba99e3845a
Added normal collar functionality.
...
You can now name your victim's collars on top of other functionality.
2017-10-03 12:12:52 -07:00
f4ce4a3a27
Shock Collars Are Now A Thing.
...
Exactly what it says on the tin.
2017-10-03 08:03:03 -07:00
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
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
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
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
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
ef715b7837
Removes all checks for subsystem existence ( #2252 )
2017-08-04 08:41:52 -07:00
dd22c79678
Completes major inhand split project ( #2178 )
2017-08-02 06:30:33 -05:00
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
1b70c06474
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs ( #1970 )
2017-07-10 16:10:42 -07:00
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
7e9b96a00f
April sync ( #360 )
...
* Maps and things no code/icons
* helpers defines globalvars
* Onclick world.dm orphaned_procs
* subsystems
Round vote and shuttle autocall done here too
* datums
* Game folder
* Admin - chatter modules
* clothing - mining
* modular computers - zambies
* client
* mob level 1
* mob stage 2 + simple_animal
* silicons n brains
* mob stage 3 + Alien/Monkey
* human mobs
* icons updated
* some sounds
* emitter y u no commit
* update tgstation.dme
* compile fixes
* travis fixes
Also removes Fast digest mode, because reasons.
* tweaks for travis Mentors are broke again
Also fixes Sizeray guns
* oxygen loss fix for vore code.
* removes unused code
* some code updates
* bulk fixes
* further fixes
* outside things
* whoops.
* Maint bar ported
* GLOBs.
2017-04-13 23:37:00 -05:00
Letter N