cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-18 01:26:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,466 Commits 17 Branches 2 Tags
e0f22c9931b3e89af5ecafe58ae6d0bf06bdcfba
Commit Graph
5315 Commits
Author SHA1 Message Date
Mloc e0f22c9931 Turn off control_freak for profiling and stuff. 2013-05-15 22:52:25 +02:00
Chinsky 917ce079ab Merge pull request #2763 from fauxki/bleeding-edge-freeze 
Quick Fixes - BEF
 2013-05-15 11:35:15 -07:00
fauxtada 2b9130b00f Quick Fixes 
- Changed access to security washroom so detective can go in.
- Removed wall that was under maintence tunnel door.
- Fixed writerer's custom item. AGAIN. .. Because they can't decide what character they want it on.
- Added saloon dress to bar closet.
 2013-05-15 11:26:26 -07:00
cib ad6105b380 Merge remote-tracking branch 'main/master' into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-05-14 01:29:45 +02:00
Chinsky c99fec15ef Merge pull request #2748 from SkyMarshal/bleeding-edge-freeze 
Centcom now has sexy uniforms and IDs.  Emag now looks like modified standard ID card again.
 2013-05-13 10:57:53 -07:00
Chinsky 8af44c59f3 Merge pull request #2750 from Asanadas/master 
Bugfix: Fix for bloody hands not occurring.
 2013-05-13 10:56:30 -07:00
Asanadas b81d0f1234 carnie umm, dunno if you guys have this bug: mobs not getting bloodyhands etc? 
carnie	do a find-all for "//people with TK won't get smeared with blood" without the quotes
carnie	the > on that line should be a <=
carnie	erro's to blame
carnie	Mport provided the fix
Asanadas	if you say so, strange IRC man
 2013-05-12 02:19:56 -04:00
SkyMarshal 697ab3dd7f Centcom now has sexy uniforms and IDs. Emag now looks like modified standard ID card 2013-05-11 03:39:31 -07:00
Ravensdale 754057cd09 hopefully disables glasses, unable to replicate bug. 2013-05-10 17:39:59 -07:00
Chinsky a9883979ce Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	code/controllers/voting.dm
 2013-05-10 15:28:32 +04:00
Mloc c4b9eddcf6 Merge pull request #2741 from Spamcat/master 
Lone fix
 2013-05-07 09:33:43 -07:00
Spamcat bb962862ca Posibrains should work correctly in spiderbots. 
Fixed the key transfer issue. (#2534)
 2013-05-07 20:08:12 +04:00
Mloc-Argent 0c820277c8 Merge branch 'master' of github.com:Baystation12/Baystation12 into emergency-bef 2013-05-06 15:45:09 +01:00
Mloc-Argent 27759f47df Merged master into BEF. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-05-06 15:43:50 +01:00
Mloc dad4430a55 Merge pull request #2739 from Aranclanos/ServerCrashFix 
Server crash fix.
 2013-05-06 04:38:08 -07:00
Aranclanos 7312807346 Reverting the comment out on the sprites and added the correct path, the xenoarcheology.dmi 2013-05-05 21:21:09 -03:00
Aranclanos d762024d68 Fixed the server crash, it was an infinite loop when a revolver spawned in the xenoarcheology. It added bullets (tried, because it didn't work either) over and over nonstop. 
Commented out the sprite selection on the revolvers in the xenoarcheology spawn code, it selected wrong names and they ended up being invisible. Now they will have the default sprite, the black revolver.
 2013-05-05 21:12:15 -03:00
Spamcat 02fd487008 Blood type now saves in savefile. 
fixes #2738
 2013-05-04 13:22:21 +04:00
Spamcat f7f6c682cf Made nearsightedness not consume a fuckton of memory. 
Also it now adds glasses on preview pic.
 2013-05-03 23:58:56 +04:00
Spamcat 203873bef9 Merge branch 'master' of github.com:Baystation12/Baystation12 2013-05-03 21:50:33 +04:00
Cael_Aislinn bfdeeb4f94 resolved a MySQL statement issue 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-05-03 13:21:44 +10:00
sick-trigger c6323eced1 Better monky throwing fix 
now, actually compiles! There seems to be a lot else wrong with monkey inventories but eh
 2013-05-03 04:46:21 +10:00
Mloc 2989961542 Merge pull request #2729 from sick-trigger/master 
Fix to let monkeys throw right
 2013-05-02 05:14:37 -07:00
fauxtada cdb3466cd9 may or may not fix issue of missing sprite for captain's uniform jacket. 2013-05-02 03:19:23 -07:00
fauxtada fed2bfcedc fixed michael guess' zippo, added therapy doll dmis to code, the items aren't coded because i cannot get it to work for the life of me. 2013-05-02 02:00:04 -07:00
sick-trigger d44986542f Monkeys can now throw properly 2013-05-01 21:56:53 +10:00
MisterBook bfee1a8cd5 Alters the pAI and AI crew manifest verb to display the fancier version, a la the ID Computer's Crew Manifest call. Also replaced a dirty, dirty looping List write with the far more elegant if call to data_core.get_manifest() 2013-04-30 23:57:49 -05:00
Spamcat 0acd40326f Increased pill bottle capacity to 14 pills (2 rows). 
Also fixed #2714.
 2013-04-30 15:44:31 +04:00
fauxtada e384c90093 minor changes 
- Fixed accesses to security office doors.
- Added a second HoP closet for attire purposes. Armor and guns in one closet - fancy clothes in the second one.
- Fixed Writerer's custom item thing. Was attached to wrong character.
 2013-04-30 02:37:43 -07:00
MisterBook 73997d7bd4 Fixes Godmode for humans so that it truly is godmode. Good for bug checking. Atmos temperature difference will no longer directly apply fireloss, nor will being punched or shot in the guts damage organs. Can no longer be shocked. 2013-04-29 22:35:58 -05:00
DarkTechnomancer 99503c5542 Imported the option to start nearsighted and give glasses to those who do. 2013-04-28 22:45:15 -04:00
jediluke69 a87a2abb37 Milkshakes and Rewriter should now have effects 2013-04-27 20:15:12 -04:00
jediluke69 e54b172a09 fixes my silly mistake on drink results... 2013-04-27 19:53:38 -04:00
Spamcat 6bd34da085 Fixes #2689. 2013-04-27 13:54:13 +04:00
Spamcat e4763aa928 Fixed #2708. 2013-04-27 13:49:44 +04:00
Chinsky 8ce8e35d02 Merge pull request #2704 from SkyMarshal/airfixes 
Made circulators and TEGs work, updated Rowtree's station with a functional powergrid and TEG battery.
 2013-04-25 11:02:14 -07:00
fauxtada 48a6326747 custom items update 
- Michael Guess' golden lighter
- Krinn's saucepan hat
- Writerer's cat thing
 2013-04-25 00:57:55 -07:00
Asanadas f2ce063eda Fixes a slip-up division thing. 2013-04-24 20:01:49 -04:00
SkyMarshal 3b41db4a18 Made circulators and TEGs work, updated Rowtree's station with a functional powergrid and TEG battery. 
Signed-off-by: SkyMarshal <skymarshal1729@gmail.com>
 2013-04-24 15:58:39 -07:00
jediluke69 85eb0f1224 Adds new drinks and fixes a few things 2013-04-24 18:49:01 -04:00
Asanadas ff229d5780 This 10x increases the size of admin-uploadable sound .ogg files and MIDI (10MB Midi, a scary thought). Should be big enough for any space assholes. Players can always opt out of uploaded music being downloaded and played with their "Hear/Silence-Midis" verb. 2013-04-24 17:55:14 -04:00
Asanadas f03da6fb94 Spelling fix for a button only admins ever see. 2013-04-24 17:20:43 -04:00
Chinsky 1745befd08 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-04-24 21:54:00 +04:00
fauxtada c1991ba0dd Player Requests Edition 
- Two canes will spawn in medbay storage for people with leg injuries.
- Added some more welding goggles for engineers in engineering.
- Armory has a second security hardsuit.
- CMO has hallway access to the medbay hardsuits.
- HoS hat spawns in HoS closet.
- White wedding dress spawns in chaplain closet.
- Removed Pulse Rifle and Laser Canon from ERT room.
- Detective's office will now start off with a cigeratte pack and a detective's flask.
- Three normal boring flasks now spawn behind the bar for the bartender to give out.
- Old Man Suit spawns in laundry room. - Requested by Book.
- Roaper's Callum suit ( http://baystation12.net/forums/viewtopic.php?f=33&t=7047 ) now spawns in under Knockoff Suit. It may or may not spawn in for him too, I don't know how this shit works but I think I got it right.
- Removed Roaper's items for Ian Colm. At least the code part, I don't know if I'm supposed to delete the DMIs or not so I left them in.
 2013-04-24 03:04:35 -07:00
Chinsky 47b28e5cce Merge pull request #2690 from fauxki/bleeding-edge-freeze 
Bleeding edge freeze - Map / Clothing changes
 2013-04-23 16:15:05 -07:00
Chinsky c8b800e6d9 Merge pull request #2695 from NerdyBoy1104/bleeding-edge-freeze 
Small Hydroponics update.
 2013-04-23 16:12:36 -07:00
NerdyBoy1104 390029007d Added Rice and Plastellium plants. Rice stalks are grinded into rice that you can make boiled rice, rice pudding and Sake from. Plastellium is refined into plastic by grinding it into plasticide. 20 plasticide + 10 poly acid makes 10 sheets of platic which can be used to make crates, forks, spoons, knives, ashtrays or plastic bags from. 2013-04-23 22:52:08 +01:00
Mordeth221 3bff68a9a2 Fixed icon_state of sven-kit to sven_kit 2013-04-23 23:11:12 +02:00
Mordeth221 76b2941803 Added custom APLU 2013-04-23 18:56:44 +01:00
fauxtada 272d7925cf Sorry, sorry! 
The last commit was full of compiling errors, this fixes that one.
 2013-04-22 13:29:23 -07:00