BongaTheProto
d08cb554e9
Merge branch 'master' into pr/660
2023-02-13 14:09:17 -05:00
BongaTheProto
0cfe8e33eb
Merge remote-tracking branch 'upstream/master'
2023-02-12 21:42:34 -05:00
SandPoot
2b8a20bae2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-02-12 22:59:51 -03:00
BongaTheProto
ce464a6903
Merge remote-tracking branch 'upstream/master'
2023-02-11 21:25:29 -05:00
SandPoot
b62b5c3e12
fix more alt titles
2023-02-11 14:02:22 -03:00
Timothy Teakettle
5f6e204866
Merge pull request #15940 from squib-bot/fermichemwork
...
Re-Adding Bounty Consoles
2023-02-11 00:06:37 +00:00
BongaTheProto
d9d617bf8d
Merge branch 'Sandstorm-Station:master' into master
2023-02-10 16:53:13 -05:00
SandPoot
65c38e9828
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-02-10 02:18:08 -03:00
Timothy Teakettle
390dcbcea0
Merge pull request #15966 from SandPoot/accessory-equip
...
Adds accessory quick-equip, a tab for it on the loadout and previews for accessories on the prefs screen
2023-02-09 21:39:05 +00:00
Comicao1
fe01f1c5da
Veymed limbs (bounty)
2023-02-07 23:46:49 -03:00
SandPoot
5052f836e7
the stuff
2023-02-06 19:54:54 -03:00
BongaTheProto
2eccd56e6b
Merge branch 'master' into pr/660
2023-02-03 19:48:12 -05:00
BongaTheProto
0e1c099482
Merge pull request #729 from LeDrascol/brain-trauma-toys
...
Add roleplay brain trauma toys
2023-02-03 17:59:46 -05:00
BongaTheProto
9e9f9915fa
Merge remote-tracking branch 'upstream/master'
2023-02-03 17:23:22 -05:00
SandPoot
996e472f80
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-02-03 18:53:29 -03:00
Timothy Teakettle
f40584685b
Merge pull request #15952 from zeroisthebiggay/sabre
...
very ready sabre resprite and minor sprite tweaks
2023-02-03 09:53:15 +00:00
Timothy Teakettle
560fbd3ffb
Merge pull request #15956 from zeroisthebiggay/posters
...
poster resprite bottom text
2023-02-03 09:52:48 +00:00
Darius
fce50e1b81
Add roleplay brain trauma toys
...
Adds arcade machine prizes that grant roleplay-oriented brain traumas; Split Personality and Imaginary Friend. Each item is single use.
2023-02-01 16:31:48 -05:00
BongaTheProto
7146a5f2eb
Merge remote-tracking branch 'upstream/master'
2023-01-30 17:02:01 -05:00
zerothebigboy
8776b8c0cc
epic
2023-01-29 22:35:59 -05:00
zerothebigboy
c99b22fe32
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into sabre
...
# Conflicts:
# icons/obj/items_and_weapons.dmi
2023-01-29 21:59:01 -05:00
SandPoot
8ae64b1bd8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-29 19:16:50 -03:00
silicons
469ac02274
Merge pull request #15950 from SandPoot/trigger-events-tgui
...
Event menu rewrite
2023-01-29 13:46:39 -08:00
zerothebigboy
e76221f68b
yeppers
2023-01-29 03:57:32 -05:00
zerothebigboy
b8bc94ba13
man
2023-01-29 00:49:55 -05:00
BongaTheProto
8a53e33271
Merge branch 'master' into pr/660
2023-01-28 22:11:29 -05:00
SandPoot
54641ce201
send
2023-01-23 20:44:28 -03:00
Darius
d7997fbdf9
Remove quirk DNC
...
Removes the DNC quirk, as the upstream merge makes it redundant.
2023-01-22 11:44:54 -05:00
BongaTheProto
620380e188
Merge remote-tracking branch 'upstream/master'
2023-01-21 13:15:29 -05:00
SandPoot
54192d4d0d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-20 21:35:34 -03:00
Lin
bd6a170299
Merge pull request #15943 from SandPoot/silicon-stuff
...
Update some silicon stuff
2023-01-18 17:52:06 -07:00
BongaTheProto
21c3abdfb7
Merge remote-tracking branch 'upstream/master'
2023-01-18 04:20:45 -05:00
SandPoot
e76ed6a1ea
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-17 22:26:56 -03:00
SandPoot
0ebcf0b72f
stuff
2023-01-16 18:16:32 -03:00
Crowbar764
9098fbee8d
Update code/game/objects/structures/electricchair.dm
...
Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com >
2023-01-15 03:01:03 +00:00
Casper
ae399d1d7c
Fixes e-chair and shockkit runtimes.
2023-01-14 22:13:00 +00:00
President of Shit PRS
d063144713
Re-Adding Bounty Consoles
...
Civilian bounties are great, don't get me wrong. But they're civilian bounties and it feels like cargo lost their thing to do, namely putting annoying sheets of paper everywhere. Plus checklists make the brain go ding when you work through them arooga.
2023-01-14 02:01:12 +00:00
Timothy Teakettle
35d01aa0f4
Merge pull request #15918 from LeDrascol/port-heirloom-update
...
[PORT] Non-global heirloom definitions
2023-01-12 23:39:41 +00:00
BongaTheProto
86a005b590
Merge remote-tracking branch 'upstream/master'
2023-01-11 12:51:40 -05:00
SandPoot
03304ba2c8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-10 22:50:16 -03:00
Timothy Teakettle
c8fc27fc9c
Merge pull request #15930 from SandPoot/reskinning
...
Update to reskinning
2023-01-11 01:00:35 +00:00
SandPoot
3b8d102fac
puts pda in the system to remove shitcode
2023-01-10 20:02:12 -03:00
SandPoot
cf51a4dce9
dusting off
2023-01-10 18:32:49 -03:00
SandPoot
6bbd44afe7
element time
2023-01-10 18:08:17 -03:00
BongaTheProto
d6aa3acbd4
Merge remote-tracking branch 'upstream/master'
2023-01-09 17:08:06 -05:00
BongaTheProto
ab9d691f1a
Merge remote-tracking branch 'upstream/master'
2023-01-09 16:59:38 -05:00
SandPoot
2a772c8482
Adds the commando skin from ror & ror2 to the mining hardsuit ( #280 )
...
* first commit with everything
* quick fix and little extra usage!
* the boy
* previous could break
* better head
2023-01-09 18:55:07 -03:00
SandPoot
543b18c435
oops shrug
2023-01-09 17:55:51 -03:00
SandPoot
d743096f8a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-09 17:50:19 -03:00
SandPoot
f066a260f2
previous could break
2023-01-09 08:05:48 -03:00
