Commit Graph

1762 Commits

Author SHA1 Message Date
Ghommie
8d9832938f New sprites for the curator, lawyer and roboticist pda cartridges. 2019-06-28 03:31:46 +02: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
kevinz000
d30560f7d7 Merge pull request #8722 from Trilbyspaceclone/patch-186
Makes tower shield be see able
2019-06-23 06:52:25 -07:00
kevinz000
082d6c75a9 Merge pull request #8688 from Ghommie/Ghommie-cit67
Ports in bee plushes.
2019-06-23 06:45:49 -07:00
kevinz000
228df53c99 Merge pull request #8698 from Ghommie/Ghommie-cit72
Fixes "Penlights Cannot Give Eye Exams"
2019-06-23 06:41:03 -07:00
kevinz000
e7331b3c98 Merge pull request #8571 from Thalpy/Dwarf
Medical smartdarts.
2019-06-23 06:24:10 -07:00
Ghom
41bd3caf3c Ports "Reorganizes the uplink, adds grenades and explosives category." (#8669)
* Ports "Reorganizes the uplink, adds grenades and explosives category."

* Unbent codex, singing the sorrow of aborted spoils.

* .
2019-06-23 06:00:27 -07:00
Trilbyspaceclone
1d4f55cab2 makes tower shield be seeable 2019-06-22 13:34:08 -04: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
Fermi
095ea1243b Fits better. 2019-06-19 00:39:38 +01:00
Fermi
f5c98f5d57 Merge branch 'Dwarf' of https://github.com/Thalpy/Citadel-Station-13 into Dwarf 2019-06-19 00:17:30 +01:00
Fermi
fe6296b58a Added crafting recipies as per Bhijin's request. 2019-06-19 00:17:18 +01:00
Ghommie
3e834004ec Ports in bee plushes. 2019-06-18 23:31:09 +02:00
Thalpy
1cc0724519 Merge branch 'master' into Dwarf 2019-06-17 12:09:55 +01:00
deathride58
b487b0103b Merge pull request #8574 from Citadel-Station-13/durasteel_toolboxes
Adds 2 TC durasteel toolboxes {5 stamcost, 18 mob damage, 18+22+10 structural damage, does not fit in any kind of backpack}
2019-06-16 22:52:47 -04:00
deathride58
7b329ae824 Merge pull request #8593 from Citadel-Station-13/changeling_adrenaline
Fixes adrenaline (it didn't actually work). Replaces traitor/ling adrenal omnizine with regenjelly (3x faster, but lasts shorter too), reworks changeling adrenals to scale burst stamina heal rather than flat 100
2019-06-16 22:51:03 -04:00
kevinz000
28ca8dee46 Merge pull request #8648 from Trilbyspaceclone/patch-178
Buffs uplink kits
2019-06-16 19:47:09 -07:00
kevinz000
78c969a9cb Merge pull request #8584 from Trilbyspaceclone/patch-172
Organ Storage box
2019-06-16 19:43:10 -07:00
kevinz000
27d7dc430f Merge pull request #8497 from BurgerLUA/Clockwork-Reflectors
Adds Clockwork Reflectors
2019-06-16 19:41:57 -07:00
kevinz000
27333276de Merge pull request #8570 from Trilbyspaceclone/patch-170
Ports origami skills for paper wiz loot
2019-06-16 19:40:01 -07:00
kevinz000
1739ee1685 Merge pull request #8578 from Ghommie/Ghommie-cit41
Clears up Extinguisher's slippery instructions.
2019-06-16 19:38:23 -07:00
kevinz000
1a6450a2e2 Merge pull request #8416 from Trilbyspaceclone/patch-135
Gives sec EVA suits storge some Sec Jetpacks
2019-06-16 19:35:05 -07:00
kevinz000
6c560c566f Merge pull request #8579 from Trilbyspaceclone/patch-171
Gives gangs a new shield and makes their boots cheaper
2019-06-16 19:32:38 -07:00
kevinz000
9e85eb5757 Merge pull request #8618 from Trilbyspaceclone/Magless
Corrects ammo boxes spawning, as well as buffs cargo shotgun crates
2019-06-16 19:29:04 -07:00
Trilbyspaceclone
5716ea7a4b Update shields.dm 2019-06-16 10:22:07 -04: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
b0264414b2 Merge pull request #8576 from Sishen1542/whipcrack
Whips are long again (except yours, curator)
2019-06-16 01:18:37 -07:00
kevinz000
12ecaf63ee Merge pull request #8605 from Trilbyspaceclone/patch-174
Adds medical breifcases
2019-06-16 01:11:11 -07:00
kevinz000
8e10286fd6 Merge pull request #8484 from BlackMajor/Dunga
Adds bluespace compression kit and superglue
2019-06-16 01:10:25 -07:00
Trilbyspaceclone
c0d3ddceeb Update uplink_kits.dm 2019-06-15 22:59:24 -04:00
Ghommie
a3c2ed0b52 fixes. 2019-06-15 02:19:57 +02:00
Ghommie
e2bf5b73fd I'm being too careless, sorry for the many commits. 2019-06-12 23:22:31 +02:00
Ghommie
7a8eaf41ac another get_cell() 2019-06-12 23:21:42 +02:00
Ghommie
5ba46eb517 Avoid runtiming. 2019-06-12 23:20:34 +02:00
Ghommie
2edef99b08 . 2019-06-12 23:16:27 +02:00
Ghommie
a29095cbe1 Penitence for the awful mistakes I have done in the refactor. 2019-06-12 23:06:09 +02:00
Ghommie
5a35e95735 . 2019-06-12 22:52:05 +02:00
Ghommie
4cc7636da1 fixing more. 2019-06-12 22:50:09 +02:00
Ghommie
368267f53d dddddd 2019-06-12 20:31:24 +02:00
Ghommie
516b71ed7e fixing stunbatons. 2019-06-12 20:13:08 +02:00
TrilbySpaseClone
3cebb1e807 Worked?
Yay?
2019-06-10 22:59:36 -04:00
Sishen
13853ac6bf removes family gavel, readds briefcase 2019-06-10 10:16:32 -04:00
Sishen
400ad0b03b added family gavel 2019-06-10 09:55:23 -04:00
kevinz000
8ba3609a4d god why fuck 2019-06-10 00:07:04 -07:00
AnalWerewolf
8337692650 Merge branch 'master' into Fritz-cute 2019-06-10 15:15:41 +10:00
Trilbyspaceclone
e6e5e62db2 Update briefcase.dm 2019-06-09 11:50:47 -04:00
Trilbyspaceclone
60e89a6ca4 wrong w_class 2019-06-08 16:19:16 -04:00