Thalpy
|
9c7b1dee97
|
Merge branch 'master' into master
|
2019-07-15 21:23:04 +01:00 |
|
Thalpy
|
4c4dbd0e17
|
Merge branch 'master' into master
|
2019-07-13 19:33:46 +01:00 |
|
Ghommie
|
129ca9d71f
|
Ports "Refactors NODROP flag into TRAIT_NODROP"
|
2019-07-13 10:27:39 +02:00 |
|
kevinz000
|
c012418cf7
|
Merge pull request #8734 from Ghommie/Ghommie-cit84
Sort of porting "Changes the type pathing of some "random" items"
|
2019-07-12 07:43:12 -07:00 |
|
Ghommie
|
92fadcf230
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit84
|
2019-07-11 09:07:11 +02:00 |
|
Fermi
|
aece9b31ed
|
Mistakessss!
|
2019-07-09 23:28:12 +01:00 |
|
Fermi
|
ce390fb595
|
Tweaks to MK
|
2019-07-09 23:27:37 +01:00 |
|
Ghommie
|
490ae9daf2
|
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
|
2019-07-09 07:58:22 +02:00 |
|
Thalpy
|
c418312cc6
|
Merge branch 'master' into master
|
2019-07-09 05:33:09 +01:00 |
|
kevinz000
|
d61732472c
|
Merge pull request #8831 from Ghommie/Ghommie-cit115
Holographic PDA Quickfix!
|
2019-07-07 11:08:15 -07:00 |
|
kevinz000
|
1b4df74efb
|
Merge pull request #8802 from Ghommie/Ghommie-cit101
Ports in RPGs for nuke ops, failsafe uplink codes, some carp plushie exploit fix etc.
|
2019-07-07 02:39:07 -07:00 |
|
Thalpy
|
cc39c9f896
|
Merge branch 'master' into master
|
2019-07-06 16:03:17 +01:00 |
|
Ghommie
|
00879a6e28
|
Holographic PDA Quickfix!
|
2019-07-06 03:46:01 +02: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 |
|
Thalpy
|
8a6e669060
|
Merge branch 'master' into master
|
2019-07-04 03:14:29 +01: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 |
|
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
|
f39a5d2f6a
|
Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix.
|
2019-06-30 21:53:33 +02:00 |
|
Ghommie
|
c569da5713
|
Fixes PDA skin preference not saving up.
|
2019-06-30 17:17:23 +02: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 |
|
Thalpy
|
696d879874
|
Merge branch 'master' into master
|
2019-06-29 15:48:25 +01:00 |
|
Ghommie
|
513f0af0fa
|
turns out the curator cartridge already had an (unused) sprite.
|
2019-06-28 17:14:57 +02:00 |
|
Ghommie
|
180ab72b78
|
more changes.
|
2019-06-28 03:45:42 +02:00 |
|
Ghommie
|
8d9832938f
|
New sprites for the curator, lawyer and roboticist pda cartridges.
|
2019-06-28 03:31:46 +02:00 |
|
Ghommie
|
67f00fc049
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit42
|
2019-06-24 16:48:15 +02:00 |
|
Fermi
|
10109d0fe5
|
Merge branch 'pr/18'
|
2019-06-23 19:15:07 +01:00 |
|
kevinz000
|
05f304f9c0
|
Merge pull request #8692 from Ghommie/Ghommie-cit69
[s] Ports "Fixes PDA TK exploits" and "Fixes pride mirror exploit"
|
2019-06-23 06:56:17 -07:00 |
|
Ghommie
|
a2d896351b
|
Sort of porting "Changes the type pathing of some "random" items"
|
2019-06-23 07:10:11 +02:00 |
|
Ghommie
|
44a9fe9521
|
Fixes "Penlights Cannot Give Eye Exams"
|
2019-06-19 13:38:59 +02:00 |
|
Ghommie
|
55795355fd
|
Ports "[s] Fixes pride mirror exploit"
|
2019-06-19 03:31:36 +02:00 |
|
Ghommie
|
df9c4fd1f4
|
[s] Ports "Fixes PDA TK exploits"
|
2019-06-19 03:08:44 +02:00 |
|
Thalpy
|
41eee65b15
|
Merge branch 'master' into master
|
2019-06-17 12:18:40 +01:00 |
|
kevinz000
|
89dd3d4e87
|
Merge pull request #8657 from BlackMajor/Dunga
HAHA WHOOPS I ACCIDENTALLY NUKED IT
|
2019-06-16 03:11:26 -07:00 |
|
BlackMajor
|
979455d86a
|
HAHA WHOOPS
|
2019-06-16 22:10:00 +12:00 |
|
kevinz000
|
8e10286fd6
|
Merge pull request #8484 from BlackMajor/Dunga
Adds bluespace compression kit and superglue
|
2019-06-16 01:10:25 -07:00 |
|
Fermi
|
6b9becce71
|
Merge branch 'pr/14'
|
2019-06-14 21:29:04 +01:00 |
|
Thalpy
|
ad8c1593f6
|
Reduced medical jargon on scanners.
|
2019-06-13 01:47:29 +01:00 |
|
Ghommie
|
b4ccfe078a
|
snap
|
2019-06-10 00:35:57 +02:00 |
|
Ghommie
|
79c4ce502e
|
more pda skins.
|
2019-06-10 00:28:43 +02:00 |
|
Ghommie
|
cce9c87af7
|
shower ideas.
|
2019-06-09 20:46:37 +02:00 |
|
Ghommie
|
88ab1794a6
|
lazylen
|
2019-06-09 20:00:54 +02:00 |
|
Ghommie
|
d2e216f2de
|
tested fixed tested fixed tested.
|
2019-06-09 19:55:08 +02:00 |
|
Ghommie
|
480ee9a9da
|
Reskinnable PDAs.
|
2019-06-08 19:55:47 +02:00 |
|
kevinz000
|
ab565d2483
|
Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
|
2019-06-08 01:22:16 -07:00 |
|
BlackMajor
|
c5f79c9da8
|
Fine i'll put it back in tools then, will that make you happy?
|
2019-06-07 12:30:34 +12:00 |
|
BlackMajor
|
21fd11718a
|
Bundled glue in with compression kit PR
|
2019-06-07 12:00:06 +12:00 |
|
Ghommie
|
d3d2b8d898
|
should be ready.
|
2019-06-06 19:24:20 +02:00 |
|
Fermi
|
228ab5b7c9
|
+Acute hepatic pharmacokinesis. (untested, will test with alterations)CC
|
2019-06-05 00:23:42 +01:00 |
|
BlackMajor
|
46123cb1fa
|
First attempt at making size change damage (doesn't work yet)
|
2019-06-01 02:45:14 +12:00 |
|
BlackMajor
|
2b1931c217
|
Compression kit can now shrink dicks. Also gives it way more feedback.
|
2019-06-01 00:42:40 +12:00 |
|