 BlackMajor
|
fbc2d3c8fe
|
Ports dogborg sprites from RP to main
Includes sit sprites, rest style verb, changing where sit sprites update in robot update_icons so that eye layers get cut properly when resting, etc.
|
2019-09-06 01:23:53 +12:00 |
|
|
kevinz000
|
748550895d
|
Merge pull request #8632 from Arturlang/Traitor_Codeword_Highlight
Ports traitor codeword highlighting
|
2019-07-05 06:57:49 -07:00 |
|
|
kevinz000
|
77743c9a0f
|
Merge pull request #8794 from Ghommie/Ghommie-cit100
Fixes the uplink category indexing.
|
2019-07-05 06:56:22 -07:00 |
|
|
kevinz000
|
231e0170a9
|
Merge pull request #8663 from Ghommie/Ghommie-cit58
Peanuts, peanut butter, and PB&J sandwiches.
|
2019-07-05 06:55:49 -07:00 |
|
|
kevinz000
|
7544748570
|
Merge pull request #8790 from deathride58/pryablesleepers
Tweaks dogborg sleeper insert/resist values, and adds the ability to pry open dogborg sleepers via crowbar
|
2019-07-05 06:55:18 -07:00 |
|
|
Ghommie
|
3c2e03c247
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit58
|
2019-07-04 23:46:04 +02:00 |
|
|
kevinz000
|
ba74189192
|
Merge pull request #8768 from Ghommie/Ghommie-cit94
New sprites for the some pda cartridges.
|
2019-07-03 13:47:53 -07:00 |
|
|
kevinz000
|
ce2914ab90
|
Merge pull request #8769 from Arturlang/ALT_Mech_Strafing
Alt now tempoarily disables strafing for mechs.
|
2019-07-03 13:47:29 -07:00 |
|
|
kevinz000
|
bce4ce31ab
|
Merge pull request #8778 from Ghommie/Ghommie-cit97
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
|
2019-07-03 13:47:04 -07:00 |
|
|
kevinz000
|
75f1dca544
|
Merge pull request #8773 from Sishen1542/podgang
Podweak now have all customization options.
|
2019-07-03 13:46:08 -07:00 |
|
|
kevinz000
|
e62213a6cd
|
Merge pull request #8775 from Ghommie/Ghommie-cit95
crew monitor indexing pet peeve.
|
2019-07-03 13:45:34 -07:00 |
|
|
kevinz000
|
10a584c71f
|
Merge pull request #8776 from Ghommie/Ghommie-cit96
Porting in donut fixes, beepsky smash and Neurotoxin reworks.
|
2019-07-03 13:45:02 -07:00 |
|
|
kevinz000
|
d78bd7399b
|
Merge pull request #8798 from Sishen1542/action-button-swaps
Action button swapping
|
2019-07-03 13:44:34 -07:00 |
|
|
kevinz000
|
78357018d6
|
Merge pull request #8783 from Ghommie/Ghommie-cit98
Fixing some emergency pod storage refactor fuck ups.
|
2019-07-03 13:42:49 -07:00 |
|
|
kevinz000
|
ab217e81e6
|
Merge pull request #8781 from Sishen1542/plasteel
Adds plasteel to medical and security techfabs.
|
2019-07-03 13:42:22 -07:00 |
|
|
kevinz000
|
9654308a94
|
Merge pull request #8809 from Ghommie/Ghommie-cit103
Quickfixing latejoin ghost roles, I'm sorry.
|
2019-07-03 09:52:14 -07:00 |
|
|
kevinz000
|
948bba1274
|
Merge pull request #8799 from Trilbyspaceclone/Cargo_lewds
Adds Promiscuous Organs crate to cargo
|
2019-07-03 09:51:47 -07:00 |
|
|
kevinz000
|
0f0d5323a3
|
Merge pull request #8797 from Sishen1542/rotate-emitters
Emitters can be rotated instead of only flipped
|
2019-07-03 05:20:37 -07:00 |
|
|
kevinz000
|
85534fa1ef
|
Merge pull request #8793 from Ghommie/Ghommie-cit99
Fixes PDA skin preference not saving up.
|
2019-07-03 05:19:13 -07:00 |
|
|
kevinz000
|
06f1eb6dcd
|
Merge pull request #8810 from Trilbyspaceclone/patch-185
Corrects Plastitanium total object damage
|
2019-07-03 05:18:21 -07:00 |
|
|
Ghommie
|
1fd50cc15a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit96
|
2019-07-03 04:52:57 +02:00 |
|
|
Ghommie
|
b2c5e002ec
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit94
|
2019-07-03 02:50:49 +02:00 |
|
|
Ghommie
|
33687dc2bc
|
I'm an idiot, I need to pick an element within the list, not the list itself!!
|
2019-07-01 22:53:42 +02:00 |
|
|
Ghommie
|
d0a001f663
|
Quickfixing latejoin ghost roles, I'm sorry.
|
2019-07-01 22:47:51 +02:00 |
|
|
Trilbyspaceclone
|
88c01dd521
|
I need to take a brake
|
2019-07-01 16:47:50 -04:00 |
|
|
TrilbySpaceClone
|
9d6c930b2c
|
owo
Wat dis?
|
2019-06-30 15:47:45 -04:00 |
|
|
Sishen
|
b2d5ec8d0c
|
Update action_button.dm
|
2019-06-30 15:42:04 -04:00 |
|
|
Sishen
|
2047d86095
|
Update emitter.dm
|
2019-06-30 15:33:34 -04:00 |
|
|
Ghommie
|
595398d76e
|
yea
|
2019-06-30 17:47:35 +02:00 |
|
|
Ghommie
|
831c91fce2
|
Fixes the uplink category indexing.
|
2019-06-30 17:43:34 +02:00 |
|
|
Ghommie
|
c569da5713
|
Fixes PDA skin preference not saving up.
|
2019-06-30 17:17:23 +02:00 |
|
|
deathride58
|
4b83110db7
|
fuck copypasta; Fixes master not compiling. Stop blindly copy-pasting shit from other codebases without even so much as making sure it compiles. Holy fuck.
|
2019-06-30 05:02:51 -04:00 |
|
|
deathride58
|
1efd1b2634
|
oh, and lets add a length check real quick to make sure the sleeper actually has shit in it
|
2019-06-30 04:35:34 -04:00 |
|
|
deathride58
|
cb5ed2d2cd
|
Tweaks dogborg sleeper insert/resist values, and adds the ability to pry open dogborg sleepers with a crowbar
|
2019-06-30 04:29:48 -04:00 |
|
|
kevinz000
|
cef22b3c5a
|
Merge pull request #8786 from Sishen1542/jetpacc
Update jetpack.dm
|
2019-06-29 22:17:00 -07:00 |
|
|
Sishen
|
575f70f3b2
|
Update jetpack.dm
|
2019-06-30 01:13:37 -04:00 |
|
|
kevinz000
|
be377c4bda
|
Merge pull request #8779 from Sishen1542/jetpacc
Nerfs roundstart carbon jetpacks. TAKE TWO
|
2019-06-29 20:09:33 -07:00 |
|
|
kevinz000
|
09c8a45fe2
|
Merge pull request #8770 from Arturlang/Carp_Deflecting
Carp now deflects the bullets instead of making them dissapear.
|
2019-06-29 20:08:47 -07:00 |
|
|
Ghommie
|
dc20b605fb
|
Fixing some emergency pod storage refactor fuck ups.
|
2019-06-30 00:40:39 +02:00 |
|
|
Sishen
|
3aaed75a95
|
Update smelting_designs.dm
|
2019-06-29 04:49:29 -04:00 |
|
|
Ghommie
|
ad3b709c40
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97
|
2019-06-29 06:39:21 +02:00 |
|
|
Sishen
|
97241cd1e8
|
jetpacks, take 2
|
2019-06-29 00:29:49 -04:00 |
|
|
Ghommie
|
0371a5513a
|
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
|
2019-06-29 06:03:57 +02:00 |
|
|
kevinz000
|
fbbfb02364
|
Merge pull request #8681 from Ghommie/Ghommie-cit64
Fixes vape and its sprites
|
2019-06-28 20:36:43 -07:00 |
|
|
kevinz000
|
c495a2aa47
|
Merge pull request #8739 from Sishen1542/makinggolemsgreatagain
Ports additional tg golem types! Leather, cardboard, bronze & bone. Ports bone hurting juice as well!
|
2019-06-28 20:32:15 -07:00 |
|
|
kevinz000
|
a6caf4c63f
|
Merge pull request #8729 from Ghommie/Ghommie-cit79
Ports "Removes SSreligion"
|
2019-06-28 20:30:44 -07:00 |
|
|
kevinz000
|
7e1522b76b
|
Merge pull request #8581 from Ghommie/Ghommie-cit42
[Ready]Reskinnable PDAs.
|
2019-06-28 20:30:05 -07:00 |
|
|
Ghommie
|
06ce8c6245
|
I thought I commited these already. turns out I were wrong.
|
2019-06-28 23:30:19 +02:00 |
|
|
Ghommie
|
d93e63af53
|
we just want the trauma to be niche, not unachievable.
|
2019-06-28 23:21:10 +02:00 |
|
|
Ghommie
|
3291b9c47a
|
Porting in donut fixes, beepsky smash and Neurotoxin reworks.
|
2019-06-28 23:17:12 +02:00 |
|