cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 13:07:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,466 Commits 12 Branches 2 Tags
e0f22c9931b3e89af5ecafe58ae6d0bf06bdcfba
Commit Graph
12466 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mloc e0f22c9931 Turn off control_freak for profiling and stuff. 2013-05-15 22:52:25 +02:00
Mloc 5b177df027 Merge pull request #2766 from SkyMarshal/bleeding-edge-freeze 
Fixes air alarms freezing station an hour into round.
 2013-05-15 13:29:15 -07:00
SkyMarshal a1bc5d6cf0 Fixes air alarms freezing station an hour into round. 2013-05-15 13:28:27 -07: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
Christian Bielert 2c0d1c85e8 Merge pull request #2758 from Jamini/bleeding-edge-freeze 
Adjustments to engineering based on community feedback.
 2013-05-14 18:01:12 -07:00
Jamini 62666d34a6 Adjustments to engineering based on community feedback. Added magboots to the non-engineering hardsuit spawns in EVA. 
Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-05-14 18:25:29 -04:00
Mloc 345c2b1f3c Merge pull request #2752 from CIB/feature 
Improved the command report
 2013-05-14 12:24:09 -07:00
Mloc 7ba1a22518 Merge pull request #2756 from AppleMaster/master 
Maybe probably fixes some custom item?
 2013-05-14 12:23:03 -07:00
cib bb06a18c33 Reduced chance for changeling to be listed as suspect. 
Better than discussing this forever.
 2013-05-14 21:12:47 +02:00
Apple_Master 32ea629eb3 Maybe fixes some custom items? 
Signed-off-by: Apple_Master <cheeckan@gmail.com>
 2013-05-14 18:09:20 +01:00
Chinsky dc6cf51309 Merge pull request #2754 from CIB/bleeding-edge-freeze 
Merge main into BEF
 2013-05-14 07:37:27 -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
cib d12c3f9cf3 Added a missing linebreak. 2013-05-14 00:58:49 +02:00
cib 28b40c3693 New command reports that aren't stupid. 
It will give you a list of suspects, which uses a lot of randomization to gather up anti-NT guys, actual antags, and random people.
 2013-05-14 00:39:29 +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 1f1e37b27e Merge pull request #2749 from fauxki/bleeding-edge-freeze 
Map Fixes - BEF
 2013-05-13 10:57:05 -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
fauxtada 5b2f03db10 Map Fixes - BEF 
- adjusts the piping and flooring panels in the new security wing.
- fixes the piping around the new eva since they lead to nowhere.
- adjusted the medbay lobby a bit, added a second chair behind the front desk.
- added in a xenos closet. has unathi items / wooden sandals in it currently. still need to sprite up the tajaran and skrell items.
 2013-05-11 09:33:45 -07: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
Mloc e77e905c00 Merge pull request #2745 from comma/bleeding-edge-freeze 
Sec Wing remap
 2013-05-11 02:18:15 -07:00
Mloc e8271c417c Merge pull request #2747 from Ravensdale/master 
Possible fix for glasses breaking setup character.
 2013-05-11 02:17:35 -07:00
Mloc 52583c53b2 Merge pull request #2744 from Spamcat/bef 
fixes
 2013-05-11 02:16:47 -07:00
Ravensdale 754057cd09 hopefully disables glasses, unable to replicate bug. 2013-05-10 17:39:59 -07:00
Chinsky 61cf1b279d Security wing remap. 2013-05-10 16:05:23 +04: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 5b13445e95 Merge pull request #2743 from SkyMarshal/bleeding-edge-freeze 
Fixes some runtimes as well as a merge-related bug that made heat not transfer through doors.
 2013-05-08 11:27:37 -07:00
SkyMarshal 7118add9da Fixes some runtimes as well as a merge-related bug that made heat not transfer through doors. 2013-05-08 11:26:38 -07:00
Spamcat 17269494ef fixed #2737 2013-05-08 15:13:28 +04:00
Spamcat 0decd3b078 Air alarm runtimes. 
fixed #2717
 2013-05-08 15:12:25 +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 849ec5052a Fix for compiling on case sensitive filesystems. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-05-06 16:09:10 +01:00
Mloc-Argent 80e49b830e obligatory whoops! 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-05-06 16:02:26 +01: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 15d4cc531a Removed misleading information from changelog.html 
yell at me if you don't like it
 2013-05-04 13:24:40 +04:00
Spamcat 02fd487008 Blood type now saves in savefile. 
fixes #2738
 2013-05-04 13:22:21 +04:00
Mloc ba8a159c22 Merge pull request #2736 from Spamcat/master 
Stuff v2
 2013-05-03 14:49:22 -07: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
Mloc 8d8190408f Merge pull request #2734 from caelaislinn/master 
Small fixes
 2013-05-03 04:40:16 -07: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
Cael_Aislinn 29a3e93197 added safety checks for bad values in eftpos + atms 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-05-03 13:20:47 +10:00
Mloc 09fb05cfdc Merge pull request #2733 from sick-trigger/master 
monkey throwing redux
 2013-05-02 14:22:14 -07: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