Commit Graph
689 Commits
Author SHA1 Message Date
Fermi f096e8440a Finally fixed the vocalchord button 2019-06-22 21:00:20 +01:00
Fermi 4b0efa962c Forgot to saveee 2019-06-22 13:36:19 +01:00
Fermi 226dbe7804 Fixed blank sprite for velvet chord organ 2019-06-22 13:09:18 +01:00
Fermi 713d849c03 Merge remote-tracking branch 'upstream/master' 2019-06-19 21:02:30 +01:00
kevinz000andGitHub 4f42d40681 Merge pull request #8507 from Thalpy/Wheelchairs
Adds Hoverchairs and the paraplegic trait.
2019-06-17 11:13:43 -07:00
ThalpyandGitHub 41eee65b15 Merge branch 'master' into master 2019-06-17 12:18:40 +01:00
kevinz000andGitHub 6c54c21d9c Merge pull request #8653 from Citadel-Station-13/commjacket
Donator Comm Jacket - [Ready]
2019-06-16 19:54:24 -07:00
kevinz000andGitHub 27d7dc430f Merge pull request #8497 from BurgerLUA/Clockwork-Reflectors
Adds Clockwork Reflectors
2019-06-16 19:41:57 -07:00
kevinz000andGitHub 27333276de Merge pull request #8570 from Trilbyspaceclone/patch-170
Ports origami skills for paper wiz loot
2019-06-16 19:40:01 -07:00
ThalpyandGitHub 98fc55e9f8 Merge branch 'master' into Wheelchairs 2019-06-16 17:33:57 +01:00
kevinz000andGitHub 5d8286f91c Merge pull request #8640 from Trilbyspaceclone/more_cooking1
Makes baklava pie
2019-06-16 01:10:47 -07:00
kevinz000andGitHub 8e10286fd6 Merge pull request #8484 from BlackMajor/Dunga
Adds bluespace compression kit and superglue
2019-06-16 01:10:25 -07:00
kevinz000andGitHub c6bdb74c6a Merge pull request #8623 from Arturlang/RD_ROD_SUPLEX
RD can now suplex a immovable rod.
2019-06-16 01:08:48 -07:00
Jay fcd093f566 commjacket 2019-06-16 02:11:00 -05:00
LetterJayandGitHub 0a144545c5 Merge pull request #8625 from Trilbyspaceclone/Donator-1
Blue Kimono for SFox63 - Donator
2019-06-14 21:18:28 -05:00
Fermi 6b9becce71 Merge branch 'pr/14' 2019-06-14 21:29:04 +01:00
kevinz000andGitHub 6fdb0670ee Merge pull request #8624 from Arturlang/Fix_High_Alarm_ERT_Suit
[READY] Fixes High Alert ERT suits
2019-06-14 08:53:02 -07:00
TrilbySpaseClone 1c45e2c615 Suggested 2019-06-13 16:02:48 -04:00
TrilbySpaseClone 7f3e2dd28b Kimono
Adds blue Kimono for SFox63
2019-06-11 18:00:08 -04:00
unknown 21cae7f0ed Fixed 2019-06-11 20:18:16 +03:00
unknown 80eb813a07 RD can now suplex a rod. Good fucking luck. 2019-06-11 18:53:17 +03:00
Sishen 4eccc12205 Why are we here? Just to suffer? 2019-06-10 04:56:24 -04:00
AnalWerewolf 9154b06ef1 update my SHIT 2019-06-10 15:20:52 +10:00
AnalWerewolf 8337692650 Merge branch 'master' into Fritz-cute 2019-06-10 15:15:41 +10:00
AnalWerewolf 00b3ac23f2 changed the opacity of a single fucking pixel
title
2019-06-10 14:53:47 +10:00
kevinz000andGitHub a866ceb8a2 Merge pull request #8543 from Trilbyspaceclone/patch-165
Makes SNOWCONES!
2019-06-08 01:15:58 -07:00
kevinz000andGitHub 80aa303b4e Merge pull request #8501 from Trilbyspaceclone/boxen
Colored boxes, more box icons, and more craftable box types!
2019-06-08 01:10:11 -07:00
TrilbyspacecloneandGitHub 36cf06683b Add files via upload 2019-06-07 18:37:04 -04:00
TrilbyspacecloneandGitHub 91a761460c Delete library.dmi 2019-06-07 18:36:40 -04:00
AnalWerewolf 4ff12eebd0 he bork and he woof 2019-06-07 18:10:22 +10: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 a90c364e77 Resolve conflict with gangs 2019-06-07 12:24:36 +12:00
BlackMajor 21fd11718a Bundled glue in with compression kit PR 2019-06-07 12:00:06 +12:00
Sishen b9b219d561 adds redtail 2019-06-06 16:01:40 -04:00
Sishen b7b2fbc843 Update plushes.dmi 2019-06-06 05:24:27 -04:00
Sishen eccfb8cc15 Update plushes.dmi 2019-06-06 05:22:41 -04:00
Sishen cf3002a392 slimeplush 2019-06-06 05:14:01 -04:00
TrilbyspacecloneandGitHub 9443f5bf71 Add files via upload 2019-06-05 20:11:54 -04:00
kevinz000andGitHub 980c48180c Merge pull request #8387 from JTGSZ/gangs
Ports gang mode
2019-06-05 01:55:19 -07:00
kevinz000andGitHub 3ab46405b8 Merge pull request #8489 from Coolgat3/tacticalwear
Makes combat gloves look T A C T I C O O L
2019-06-05 01:49:57 -07:00
Fermi cd310b37fe One pixel missing. 2019-06-01 18:33:42 +01:00
Fermi bebaf8e7a8 Wheelchairs are apparently banned, we now have HOVERCHAIRS! 2019-06-01 18:17:49 +01:00
Fermi af52ff29fe Fixing merge conflicts. 2019-06-01 03:23:14 +01:00
Fermi e58a94bcc7 Merge remote-tracking branch 'upstream/master' 2019-06-01 03:12:38 +01:00
kevinz000andGitHub 8b27926fee Merge pull request #8463 from Trilbyspaceclone/metal_shields
Makeshift Metal shield crafting
2019-05-31 18:00:12 -07:00
kevinz000andGitHub 59e88e0808 Merge pull request #8477 from deathride58/portsnerditems
Ports the zulie cloak and blackredgold coat donor items from RP
2019-05-31 17:58:48 -07:00
kevinz000andGitHub 16c89da587 Merge pull request #8485 from Trilbyspaceclone/plushies
More plushies - Reece Trilby Bhijn Box Justin
2019-05-31 17:55:37 -07:00
Fermi 2eceb6f57b Added a cybernetic tongue and sprites. Fixed furranium. 2019-06-01 01:28:52 +01:00
TrilbyspacecloneandGitHub 995b02b109 Add files via upload 2019-05-31 17:55:56 -04:00
TrilbyspacecloneandGitHub 23d4da8541 Delete storage.dmi 2019-05-31 17:55:36 -04:00