 Detective Google
|
6b392e09c2
|
Merge remote-tracking branch 'upstream/master' into hudpatches
|
2020-03-17 16:29:13 -05:00 |
|
|
Detective Google
|
af872d1476
|
push
|
2020-03-17 16:10:15 -05:00 |
|
|
kevinz000
|
7a25e04324
|
bet
|
2020-03-16 11:15:11 -07:00 |
|
|
kevinz000
|
7fdbcc55c6
|
s
|
2020-03-16 11:12:10 -07:00 |
|
|
kevinz000
|
d3724d5fbd
|
f
|
2020-03-16 10:59:34 -07:00 |
|
|
kevinz000
|
e3301f8722
|
bet
|
2020-03-16 10:44:02 -07:00 |
|
|
necromanceranne
|
19fd006103
|
Fixed some missing sprites
|
2020-03-17 02:12:28 +11:00 |
|
|
kevinz000
|
6af9c54da5
|
better
|
2020-03-16 04:59:55 -07:00 |
|
|
kevinz000
|
a77be038b8
|
refactoring this whole thing again
|
2020-03-16 04:56:32 -07:00 |
|
|
kevinz000
|
2a9e4bebdd
|
priority
|
2020-03-16 04:24:18 -07:00 |
|
|
kevinz000
|
69374c64c9
|
k
|
2020-03-16 04:18:22 -07:00 |
|
|
kevinz000
|
857f793600
|
ok
|
2020-03-16 04:12:54 -07:00 |
|
|
kevinz000
|
644273beca
|
k
|
2020-03-16 04:09:25 -07:00 |
|
|
Detective Google
|
828b5cdacf
|
why was this backwards
|
2020-03-16 01:57:23 -05:00 |
|
|
Detective Google
|
94f694e568
|
adds some hudpatches
seemed like fun flavor, inspired by bay and a request.
|
2020-03-16 01:44:26 -05:00 |
|
|
Ghommie
|
312ef1d961
|
Merge branch 'Ghommie-cit616' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit616
|
2020-03-15 22:38:42 +01:00 |
|
|
Ghommie
|
ea30b2fb1a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616
|
2020-03-15 22:35:59 +01:00 |
|
|
kevinz000
|
7a27baa699
|
Merge pull request #11450 from zeroisthebiggay/timefornekerchiefsuwu
ports ([READY] Allows bandannas to be worn as neckerchiefs. #40125) from TG code
|
2020-03-14 09:12:12 -07:00 |
|
|
Seris02
|
48076c921d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atomwalkers
|
2020-03-14 11:41:39 +08:00 |
|
|
ZeroMan
|
3fa39fd7ab
|
i hate my ocd
|
2020-03-12 20:57:41 -04:00 |
|
|
ZeroMan
|
f5ec7f5b65
|
it works it works
|
2020-03-12 20:47:35 -04:00 |
|
|
Putnam3145
|
480eb32c68
|
Merge pull request #11418 from Ghommie/Ghommie-cit615
Fix runtimes some more.
|
2020-03-11 17:01:13 -07:00 |
|
|
Ghom
|
bba13d706d
|
FAAAAKE
|
2020-03-12 00:16:42 +01:00 |
|
|
Ghommie
|
d31075eb54
|
Spellcasting element
|
2020-03-11 16:23:30 +01:00 |
|
|
Ghommie
|
27a7f754c4
|
Fix runtimes some more.
|
2020-03-10 22:40:06 +01:00 |
|
|
Ghommie
|
2b4b626fac
|
support for items that switch states through update_icon.
|
2020-03-10 16:55:30 +01:00 |
|
|
kevinz000
|
e210f7d535
|
Merge pull request #11391 from Ghommie/Ghommie-cit612
Porting "Further update_icon splitup"
|
2020-03-10 05:58:17 -07:00 |
|
|
kevinz000
|
d3306e2eec
|
Merge pull request #11392 from zeroisthebiggay/hardsuithelmetsarenice
syndicate elite hardsuit helmet doesnt hide masks anymore
|
2020-03-10 05:57:27 -07:00 |
|
|
kevinz000
|
bfb75eb26b
|
Merge pull request #11396 from Ghommie/Ghommie-cit613
Ports "Switches out the three billion args of electrocute act for flags"
|
2020-03-10 05:56:28 -07:00 |
|
|
kevinz000
|
aca1d70bbb
|
Merge pull request #11397 from zeroisthebiggay/helmetsarenotheavy
syndicate contractor helmets are no longer secretly lead
|
2020-03-10 05:56:08 -07:00 |
|
|
kevinz000
|
bd2aa5f54b
|
Merge pull request #11402 from Ghommie/Ghommie-cit614
Porting more legcuffs / bola fixes etcetera
|
2020-03-09 21:01:51 -07:00 |
|
|
Ghom
|
503827a0b6
|
Merge pull request #11382 from zeroisthebiggay/snowflakesyndicatecontractorshit
tauric contractor space suits
|
2020-03-09 16:50:32 +01:00 |
|
|
Ghommie
|
4143c1963c
|
Porting more legcuffs / bola fixes etcetera
|
2020-03-09 16:20:51 +01:00 |
|
|
ZeroMan
|
c079dba753
|
its a fucking helmet
|
2020-03-08 23:07:24 -04:00 |
|
|
Ghommie
|
ee1eea8874
|
Ports "Switches out the three billion args of electrocute act for flags"
|
2020-03-09 04:01:23 +01:00 |
|
|
Ghom
|
1cd9c19b4c
|
Merge pull request #11288 from Trilbyspaceclone/patch-300
[ready] Craftable Prescription & Sunglasses HUDs
|
2020-03-09 00:01:12 +01:00 |
|
|
ZeroMan
|
388891bde3
|
fianlly ive discovered obanium
|
2020-03-08 18:31:12 -04:00 |
|
|
Ghommie
|
ad4d290ea7
|
WIP
|
2020-03-08 19:26:01 +01:00 |
|
|
ZeroMan
|
a431bdb0de
|
okay here we go
|
2020-03-07 23:20:01 -05:00 |
|
|
Ghommie
|
5bcb38c79f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit610
|
2020-03-08 02:33:27 +01:00 |
|
|
Trilbyspaceclone
|
748614b98a
|
Apply suggestions from code review
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-03-07 08:26:15 -05:00 |
|
|
Ghommie
|
7bed0d5c87
|
Of runtimes and null.
|
2020-03-07 01:57:15 +01:00 |
|
|
Kraseo
|
ad20fb1a0e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
|
2020-03-06 11:58:11 +01:00 |
|
|
kevinz000
|
16d6ba9e21
|
Merge pull request #11323 from Ghommie/Ghommie-cit600
Porting a couple material datums code updates and fixes.
|
2020-03-06 00:17:21 -07:00 |
|
|
kevinz000
|
23fa750e31
|
Merge pull request #11324 from Trilbyspaceclone/patch-302
Makes medical hardsuits have built in huds
|
2020-03-06 00:17:09 -07:00 |
|
|
Trilbyspaceclone
|
1c310f6cee
|
Update hardsuit.dm
|
2020-03-04 13:01:25 -05:00 |
|
|
Ghommie
|
f2c8a7cd6f
|
Porting a couple material datums code updates and fixes.
|
2020-03-04 15:59:46 +01:00 |
|
|
kevinz000
|
1e99cd0bfe
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-03-03 03:08:41 -07:00 |
|
|
Kraseo
|
4315a4d1b7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
|
2020-03-02 23:06:29 +01:00 |
|
|
Ghom
|
c984cd7677
|
Merge pull request #11270 from ancientpower/paramedic-tweaks
Paramedic tweaks (sprites/access/stuff for future use)
|
2020-03-02 22:46:49 +01:00 |
|