Ghommie
2b740f9bad
[s] Fixing an issue with slot machines crashing the server.
2020-02-23 13:09:21 +01:00
Hatterhat
b89a2314a2
mmm that's compiling i don't like that
2020-02-22 16:17:51 -06:00
Seris02
c3ec44b0d0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-02-22 19:54:10 +08:00
kevinz000
f6542b381c
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 23:29:25 -07:00
Detective Google
ca29246878
adds the loudness booster(instruments) and Encryption key slot to pAIs. (lazy tg port 2.)
2020-02-22 00:02:49 -06: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
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
Ghom and GitHub
0f8f6e417b
Merge branch 'master' into Ghommie-cit528
2020-02-21 02:40:22 +01:00
kevinz000
c7273c03be
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-19 19:12:27 -07:00
kevinz000 and GitHub
3e073f160c
Merge pull request #10910 from Citadel-Station-13/Ghommie-patch-6
...
Fixing a little issue with sleeper UI and blood types.
2020-02-19 19:00:32 -07:00
kevinz000
0e4692c63d
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-18 18:16:34 -07:00
Ghommie
698f0b8177
Something about pAIs and silicon access priviledges.
2020-02-18 16:20:44 +01:00
kevinz000
d7949e810e
Merge remote-tracking branch 'citadel/master' into staves
2020-02-18 02:20:58 -07:00
kevinz000 and GitHub
14fdd90618
Nerfs public autolathes ( #10970 )
2020-02-16 07:37:24 +01:00
kevinz000 and GitHub
36cebc733c
Merge pull request #11039 from Ghommie/Ghommie-cit572
...
Something about a couple runtimes.
2020-02-15 12:19:50 -07:00
kevinz000 and GitHub
7ee04aa608
Merge pull request #10998 from Ghommie/Ghommie-cit569
...
Something about the in operator and spaceDMM version update.
2020-02-15 12:17:37 -07:00
kevinz000 and GitHub
ee9b38017e
Merge pull request #10995 from Ghommie/Ghommie-cit568
...
Something about cryopods.
2020-02-15 12:17:02 -07:00
kevinz000 and GitHub
f79148d549
Merge pull request #10947 from Ghommie/Ghommie-cit563
...
Holopad static fix and a few other mistakes.
2020-02-15 12:16:23 -07:00
Seris02
2d9c8ce8fc
fixing merge conflicts
2020-02-15 15:41:52 +08:00
Ghom and GitHub
1e57664a99
Merge pull request #10934 from kevinz000/actual_ghost_newscasters
...
Ok that last merge was a complete mistake so I kind of redid the feature myself (book/newscaster ghost reading)
2020-02-14 19:21:48 +01:00
Artur
7964d768fa
Initial Commit
2020-02-13 20:51:52 +02:00
kevinz000
eca0e0f2dc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-13 00:39:20 -07:00
Ghommie
62ff589840
Something about a couple runtimes.
2020-02-12 09:10:24 +01:00
kevinz000 and GitHub
9459212692
Update brigdoors.dm
2020-02-11 08:51:24 -07:00
kevinz000 and GitHub
cc0b815a5d
Update brigdoors.dm
2020-02-11 08:47:32 -07:00
kevinz000
276f4b5fae
Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters
2020-02-10 04:32:01 -07:00
kevinz000
690c14a716
Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters
2020-02-10 04:29:22 -07:00
kevinz000 and GitHub
c29e0e1a1d
Merge pull request #10596 from Seris02/hijackbackup
...
Hijack Implant
2020-02-10 04:16:14 -07:00
Ghom and GitHub
0d37700836
Merge pull request #10926 from keronshb/PirateBombProof
...
Buffs the Pirate Ship to be bomb resistant
2020-02-10 08:40:10 +01:00
Ghommie
c34714cb90
Something about the in operator and spaceDMM version update.
2020-02-10 07:37:59 +01:00
Ghommie
d4c74c19de
Something about cryopods.
2020-02-10 04:26:50 +01:00
keronshb
1492586f76
Fixes round 3? 4?
...
Should fix the last round of requests?
2020-02-09 18:18:55 -05:00
keronshb
60a3b134a3
Should fix the rest of the requested changes
...
Title
2020-02-09 17:30:22 -05:00
keronshb
9609eb64e0
Fixes some files and pathings for this
...
Adds proper subtypes, put the health down a lil bit for the turret, fixed the welder type, added some tiny fans to the ship and also added some plastitanium windows where r-windows were
2020-02-09 15:18:15 -05:00
Seris02
b2d2b00238
much better
2020-02-08 14:11:49 +08:00
Lin and GitHub
5717700146
Merge pull request #10925 from Ghommie/Ghommie-cit558
...
runtime is forever, errors are eternal.
2020-02-07 17:29:49 +00:00
Seris02
4ec99a38e2
merge fixes
2020-02-07 15:28:05 +08:00
Ghommie
86c472eaf6
the holopad fix.
2020-02-07 03:17:00 +01:00
kevinz000
9a4432b3ac
initial commit
2020-02-06 00:03:17 -07:00
kevinz000
927b9d0622
Revert "Merge pull request #10883 from ancientpower/ghost-newscasters"
...
This reverts commit 3c5a3cb4d4109b15ebdd
2020-02-05 23:50:41 -07:00
kevinz000 and GitHub
3c5a3cb4d4
Merge pull request #10883 from ancientpower/ghost-newscasters
...
Allows ghosts to read newscasters and books
2020-02-05 23:46:04 -07:00
keronshb
5d1d652ea4
Buffs the Pirate Ship to be bomb proof
...
Title, also makes a few computers/machines indestructible and buffs turret health. It also allows turrets to be repairable now.
2020-02-05 18:28:00 -05:00
Ghommie
ab06c23a2b
runtime is forever, errors are eternal.
2020-02-05 23:48:17 +01:00
Seris02
ee7064840d
merge conflicts fixed finally
2020-02-05 18:42:16 +08:00
Seris02
d0100345fd
done hopefully
2020-02-05 17:00:38 +08:00
Seris02
6cc6aa12be
yeehaw it's done
2020-02-05 16:54:57 +08:00
Ghom and GitHub
16fbdd9054
Update Sleeper.dm
2020-02-05 06:45:24 +01:00
Ghommie
5dc1de1d04
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-05 04:34:54 +01:00
kevinz000
6a8a606f97
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-04 16:01:25 -07:00
Ghommie