Artur
8bb0e30036
Initial Commit V3
2020-01-31 18:17:14 +01:00
Ghommie
721fd108f9
A few more, ported, runtime fixes.
2020-01-24 03:02:07 +01:00
Putnam
d29603ad77
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
2020-01-15 15:57:32 -08:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
Putnam
d75a525b3c
let's fix arousal huh
2020-01-05 19:10:48 -08:00
Lin
b651bbcdb3
Merge branch 'master' into Ghommie-cit367
2019-12-31 22:37:59 +00:00
Ghom
93e090d229
Merge pull request #10309 from Seris02/disablerglasses
...
disabler sechuds, let the adminbus commence
2019-12-31 14:43:39 +01:00
Ghommie
edd05cebea
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
2019-12-30 00:28:36 +01:00
Seris02
f6caff8227
hnnnnnng code improvements
2019-12-29 20:10:15 +08:00
Seris02
0b6242e25d
let the adminbus commence
2019-12-28 00:40:55 +08:00
Ghommie
e1949b0131
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
2019-12-23 19:02:20 +01:00
Ghommie
395457f7ef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471
2019-12-21 17:59:32 +01:00
Linzolle
70e50e57cd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-12-17 20:21:49 -06:00
Putnam3145
670141edf7
Merge pull request #10209 from Ghommie/Ghommie-cit470
...
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
2019-12-17 11:26:36 -08:00
Ghommie
80402a0d88
Ports some hud and update_icon code updates.
2019-12-16 23:29:20 +01:00
Ghommie
447f416ca6
Merge branch 'Ghommie-cit470' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit471
2019-12-16 19:10:07 +01:00
Ghommie
93fbc17428
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
2019-12-16 17:58:50 +01:00
Useroth
8151a1f3ff
Merged master into this branch.
2019-12-16 12:06:30 +01:00
Putnam3145
c39a5d0462
Merge pull request #10011 from Arturlang/Bloodsuckers
...
Bloodsuckers, or, yknow, vampires.
2019-12-15 14:41:36 -08:00
Ghommie
414d4b7a90
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408
2019-12-09 00:04:22 +01:00
Linzolle
1e2a4f606c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-12-08 14:17:00 -06:00
Artur
9773b530f8
More fixes. Urgh
2019-12-08 21:47:25 +02:00
Useroth
5e836c51e4
Forgot to track the new files
2019-12-08 14:05:05 +01:00
Useroth
a37f2de71d
First step of porting lavaland tumors. Looks like Cita is much behind tg regarding simplemobs.
2019-12-08 14:00:08 +01:00
Artur
4711eb0987
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
2019-12-07 15:53:11 +02:00
Linzolle
19b004edab
update butchering
2019-12-01 14:35:11 -06:00
Artur
02048ce009
Bludsuckers
2019-11-29 21:28:14 +02:00
Ghommie
3b8aebbbc2
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-11-29 00:40:16 +01:00
Ghommie
af0110db40
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
2019-11-27 21:16:20 +01:00
Linzolle
cc54e5230f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-11-25 21:01:25 -06:00
BlackMajor
786d40032d
Merge pull request #9922 from GrayRachnid/braintraumasport
...
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
2019-11-25 12:31:15 +13:00
GrayRachnid
c8e52fb8e1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
2019-11-22 15:24:15 -05:00
Ghommie
21f15e411d
Part 3
2019-11-19 19:34:42 +01:00
Ghommie
b560ff8284
refactoring code to allow all living mobs to use shields.
2019-11-17 06:23:12 +01:00
Lin
6aa6eaafe6
Merge branch 'master' into abductor-update
2019-11-15 23:24:51 +00:00
kevinz000
6909857e04
Merge pull request #9632 from Ghommie/Ghommie-cit281
...
Porting multi-z support updates.
2019-11-14 15:58:53 -07:00
kevinz000
318c03cc28
Merge pull request #9683 from Ghommie/Ghommie-cit303
...
Dullahans fixes and QoL.
2019-11-14 15:52:11 -07:00
Ghommie
c5a7c28a1b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281
2019-11-12 16:04:05 +01:00
Lin
df051186eb
Merge branch 'master' into abductor-update
2019-11-11 00:08:59 +00:00
Ghommie
1e49ce76d3
Dreamchecker compatibility changes, part 1.
2019-11-10 20:48:30 +01:00
Ghommie
a650e1e411
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
2019-11-05 05:37:28 +01:00
Ghommie
a204fddc4b
Fixing some issues with dullahans.
2019-11-01 18:51:06 +01:00
Ghommie
17e794bd59
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281
2019-10-31 01:43:44 +01:00
Ghommie
8c21fac476
513 compatibility
2019-10-30 22:24:00 +01:00
Linzolle
f8188fd22b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-10-30 00:14:11 -05:00
Linzolle
266f1ff958
Merge remote-tracking branch 'upstream/master' into abductor-update
2019-10-29 23:58:01 -05:00
deathride58
18f1dc53cc
Merge pull request #9532 from MrJWhit/stam-cost-reduction
...
Reduces stamloss of melee weapons by 20%
2019-10-30 00:46:38 -04:00
kevinz000
66faef41f8
Merge pull request #9350 from Tupinambis/UIChanges
...
Cyborg UI Beautification and Improvements
2019-10-29 21:33:34 -07:00
Ghommie
4aa1d55abb
Porting multi-z support updates.
2019-10-27 16:32:32 +01:00
nik707
187ea6476b
Merge pull request #9572 from Citadel-Station-13/canReachInto_1
...
Fixes a bunch of CanReach/storage related bugs ("You can no longer stick your hands inside other people and take their things")
2019-10-25 22:16:02 -05:00
