 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 |
|
|
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 |
|
|
Kraseo
|
50a1feeb89
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
|
2020-03-02 17:38:08 +01:00 |
|
|
Trilbyspaceclone
|
da48f95de7
|
Update hud.dm
|
2020-03-02 00:11:54 -05:00 |
|
|
Kraseo
|
e3c77f2f5a
|
part 4: the one where i slowly go insane
|
2020-03-01 22:05:35 +01:00 |
|
|
ancientpower
|
56ba8ef127
|
requested changes
|
2020-03-01 12:45:00 -06:00 |
|
|
Kraseo
|
d93ade7e03
|
part 2: bloody tendency
|
2020-03-01 17:37:18 +01:00 |
|
|
Trilbyspaceclone
|
684b7714db
|
Update hud.dm
|
2020-03-01 08:21:25 -05:00 |
|
|
TrilbySpaceClone
|
51c675603e
|
???
|
2020-03-01 02:48:13 -05:00 |
|
|
Trilbyspaceclone
|
cdd97e8547
|
she
|
2020-03-01 00:12:45 -05:00 |
|
|
Trilbyspaceclone
|
e2b706961a
|
Turns out this is Rag's PR and not mine
Neet
Co-Authored-By: Ragolution <bloodlust3333@gmail.com>
|
2020-03-01 00:11:32 -05:00 |
|
|
Trilbyspaceclone
|
3c9d592b8a
|
Update miscellaneous.dm
|
2020-02-29 09:51:40 -05:00 |
|
|
ancientpower
|
f44908dc2e
|
forgot icon state changes
|
2020-02-29 02:03:25 -06:00 |
|
|
ancientpower
|
f48e56fe44
|
thanks mapdiffbot
|
2020-02-29 01:49:42 -06:00 |
|
|
ancientpower
|
c4113824f7
|
more fixes
|
2020-02-29 01:47:19 -06:00 |
|
|
ancientpower
|
ed320046c5
|
fixes icons
|
2020-02-28 11:42:15 -06:00 |
|
|
ancientpower
|
23c3e5b328
|
tweaks for the tweaks
|
2020-02-28 00:17:28 -06:00 |
|
|
ancientpower
|
12ba71f588
|
paramedic tweaks
|
2020-02-27 23:23:44 -06:00 |
|
|
kevinz000
|
56eab760fc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-27 20:11:36 -07:00 |
|
|
kevinz000
|
43c17b4ab3
|
Merge pull request #11180 from Detective-Google/psych+paramedic
Adds epic and also cool paramedics [lazy tg port]
|
2020-02-24 02:30:36 -07:00 |
|
|
kevinz000
|
59074d1174
|
Merge pull request #11183 from Trilbyspaceclone/patch-291
Removes more Trek armor.
|
2020-02-24 02:27:05 -07:00 |
|
|
kevinz000
|
f6542b381c
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 23:29:25 -07:00 |
|
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
|
Trilbyspaceclone
|
4542afa537
|
Update trek.dm
|
2020-02-21 01:14:09 -05:00 |
|
|
Detective Google
|
4c10c830bf
|
Merge remote-tracking branch 'upstream/master' into psych+paramedic
|
2020-02-20 22:17:55 -06:00 |
|
|
Detective Google
|
a8f863f901
|
changes - sprites
|
2020-02-20 22:17:47 -06:00 |
|
|
kevinz000
|
0e4692c63d
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-18 18:16:34 -07:00 |
|
|
kevinz000
|
a5f06430e4
|
repulse armor sanity (#10949)
|
2020-02-16 07:36:50 +01:00 |
|
|
Trilbyspaceclone
|
661e01ca0c
|
Update miscellaneous.dm (#11094)
|
2020-02-15 19:12:19 +01:00 |
|
|
Ghom
|
06d38eb3dc
|
Merge pull request #11086 from YakumoChen/the-ring-2
Ring Improvements
|
2020-02-15 09:04:54 +01:00 |
|