cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 08:34:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 10 Branches 2 Tags
dev-docs-readme
Commit Graph

419 Commits

Author SHA1 Message Date
Mark van Alphen 88fa0d27df Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport 
# Conflicts:
#	paradise.dme
 2019-07-15 20:30:54 +02:00
variableundefined e42e1af87a Merge pull request #11634 from Markolie/laborstacker 
Updates the prison labor point system
 2019-07-09 18:21:58 +08:00
Mark van Alphen bc12891f02 Move shuttle seat out of comfy chairs category 2019-06-07 03:59:45 +02:00
Mark van Alphen f56854292a Add shuttle chairs (and fix newlines on all maps) 2019-06-07 03:39:24 +02:00
Mark van Alphen ba3f65049d Port over remaining Lavaland ruins 2019-06-07 01:19:55 +02:00
Mark van Alphen c6e6c6cefd Even better water handling 2019-06-03 00:31:03 +02:00
Mark van Alphen fd8a9e4909 Water handling improvement 2019-06-03 00:06:29 +02:00
Mark van Alphen 697bb8eee5 More Lavaland fixes: 
- Air alarm computers will no longer display alarms that can't be remote controlled
- Survival capsules now have a NanoMed
- Fixed the disk compartmentalizer not having a sprite when something is put in
- Fixed the drying rack not having a sprite when something is put in
- Turned water bottles into glass containers so they have more functionality
- Hairless hide can now be made wet using water
- Reagents in glass containers can now be fed to others
 2019-06-02 23:29:50 +02:00
Mark van Alphen c9e87f6593 Add more explosive power to Syndicate base, add species specific sprites for explorer equipment (thanks Ionward), fix Drake explosive sound, clarify ash walker/syndicate base personnel flavor text 2019-06-01 21:17:17 +02:00
Mark van Alphen 4446664997 Update labor stacker 2019-05-31 19:37:25 +02:00
joep van der velden f07bd98a2a Blindfolds are now craftable from 3 cloth 2019-05-28 19:43:01 +02:00
Mark van Alphen 35b1cee88b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/obj/toy.dmi
 2019-05-03 18:31:45 +02:00
Arkatos1 1e363bfb88 Craftable patch pack 2019-04-30 19:51:01 +02:00
Mark van Alphen c878f8e36e Lavaland code review fixes - also integrates flyswatter and cat toy 2019-04-20 00:24:58 +02:00
CornMyCob 7eb4277a01 MORE UPDATES! 2019-04-03 20:29:16 +01:00
CornMyCob 9f5b3fc796 updates 2019-04-02 20:26:23 +01:00
Mark van Alphen 45a066c7d1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/food_and_drinks/recipes/recipes_grill.dm
 2019-03-30 22:55:09 +01:00
Mark van Alphen fb337f2825 Port over Lavaland mobs and turfs (not finished) 2019-03-29 23:45:36 +01:00
Fox McCloud 277722508a [Goonchem] Reagent Temperature 2019-03-18 20:06:15 -04:00
datlo 74a3631741 compilin and mostly workin 
has runtimes due to body color
need to wrap up commented procs
 2019-02-03 06:40:50 +00:00
Aurorablade d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
datlo d631479031 Reduce the cost of bomb frames to 3 plasteel 2019-01-22 00:41:05 +00:00
Nicaragua 8175d67b2e honk_bot from V2 
Originaly from PULL

https://github.com/ParadiseSS13/Paradise/pull/10656
 2019-01-21 12:31:47 -03:00
Aurorablade b812736517 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-19 23:35:15 -05:00
AffectedArc07 3ba1837c9f Adds reflectors 2018-12-23 23:07:01 +00:00
Aurorablade 86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05:00
lass9030 c6af6f56f3 sheet hand icons from existing sprites 2018-11-09 15:21:45 +01:00
tigercat2000 97461b3f3d Merge pull request #10078 from variableundefined/FermentationBarrel 
[READY] Port Fel's fermentation barrel from tg
 2018-11-07 23:09:08 -08:00
TDSSS a89cf91f82 now with 100% less snowflake 2018-11-06 11:42:01 +01:00
variableundefined c2f92bec5e Make fermentation barrel a stack recipe, fixes koibean and soybean being OP 2018-11-03 21:39:38 +08:00
Unknown 1cd8d2f98f Surgical Trays 
Adds Surgical Trays
 2018-10-22 17:37:51 -04:00
Mars 984339ce42 Merge-conflict fix + check for null rather than type. 2018-10-12 18:59:54 +02:00
Mars d9b60a7bfb Fix merge conflict 2018-10-09 09:41:37 +02:00
variableundefined 6b1b38d4f1 Port over tg ore stack and stack merging 
Meta

Birbfix

Maxi

Re-add automatic satchel ore pickup (oops)

Mecha formatting

re
 2018-10-09 10:06:03 +08:00
Purpose c82cd93a89 Merge branch 'master' into Refactors-beds-stools-chairs 2018-09-29 15:36:27 +01:00
variableundefined 68c35ccced Merge pull request #9527 from Ty-Omaha/muh-art 
Fixes half the server crashing, removes canvases
 2018-09-29 07:49:30 +08:00
Crazy Lemon ae68d43d46 Merge pull request #9032 from Anasari/CabinetDecon 
Allow you to construct & deconstruct fire extinguisher cabinet
 2018-09-26 17:31:15 -07:00
Purpose efbcd54cf2 Fully refactors Chairs, Stools & Beds. Adds a few fun bits 2018-09-14 18:40:42 +01:00
Ty-Omaha 28acdb1e56 removes canvases 2 
fully removes it as per tiger's critique
 2018-09-12 02:40:32 -04:00
Anasari a135d01835 Fixes 2018-08-23 14:47:43 +08:00
Mars b5b09b435c No hard-coded format in the macros anymore 2018-08-16 11:51:52 +02:00
Mars e8d92b3ced More flexible macro 2018-08-16 11:37:03 +02:00
Mars 4d3c3b29e4 Quick Regex replace action 
Used Regex to replace all hrefs with \ref and the same displayed text
with the corresponding UID macros
 2018-08-15 23:57:46 +02:00
Anasari 5e490c78e2 Allow you to construct and deconstruct fire extinguisher cabinet. Also minor refactor. (Credit to Tigercat2000) 2018-08-04 20:11:56 +08:00
Aurorablade 55c211f144 Lemins Feedback 2018-07-31 16:44:39 -04:00
Aurorablade 1ba0e9c7c4 i am tired 2018-07-31 04:06:57 -04:00
uraniummeltdown 75bded82cf added defines for window construction states and full window diagonal dir 
added a proc to check for valid window location, added var/fulltile to windows instead of using a proc
added clockwork windoors and windows to brass recipes
added titanium glass and plastitanium glass, made glass types use recipes like other stacks, you can smelt the new glasses in the ORM
removed force from RCD and added NOBLUDGEON flag, fixing a bug where you couldn't deconstruct airlocks with an RCD
slight nerf to wielded fireaxe, does high damage to windows and grilles instead of insta-deleting them
deleted fullwindow.dm and moved windows to window.dm
added some feedback to placing glass on grilles
examining windoor assembly shows you can rotate it, examining windows show deconstruction hints and rotation
added cracks to windows, you can repair windows using a welding tool on help intent, slight buff to window health
added var/cancolor to windows and blacklists some windows from being auto-colored, window shards also get colored on narsie_act()
full windows now use icon smoothing system, windows now use the obj_integrity damage system
added is_glass_sheet() helper
 2018-06-03 13:11:37 +04:00
Fox McCloud 32e3a25070 got it 2018-04-21 20:25:14 -04:00
Fox McCloud b3fa91030b oops 2018-04-15 22:41:42 -04:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00