cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 19:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,919 Commits 26 Branches 2 Tags
58253b23ce8aefec59de80faae183ee59a7c2ee9
Commit Graph

11081 Commits

Author SHA1 Message Date
Fox-McCloud
58253b23ce ammo tweak 2015-10-07 14:51:14 -04:00
Fox-McCloud
efcbf98c8d how did this not commit 2015-10-06 17:19:07 -04:00
Fox-McCloud
623696b985 Ammo Update and Fixes 2015-10-06 17:18:39 -04:00
Fox McCloud
27b33fb770 Merge pull request #2287 from Markolie/movefix 
More create poll improvements
 2015-10-04 16:03:18 -04:00
Markolie
486c64c9c4 Going to keep it in the same meny 2015-10-04 21:42:26 +02:00
Markolie
ad3096c4ec More create poll improvements 2015-10-04 21:40:57 +02:00
Fox McCloud
c845d901e2 Merge pull request #2284 from Markolie/movefix 
Create poll fixes from /tg/
 2015-10-04 03:44:00 -04:00
Markolie
a5cfb1f45c Create poll fixes from /tg/ 2015-10-04 09:03:44 +02:00
Fox McCloud
909ce846d8 Merge pull request #2274 from Markolie/movefix 
Ambulance/movement fixes
 2015-10-04 02:10:56 -04:00
Markolie
69c97863d5 Adminhelp update 2015-10-04 03:11:02 +02:00
Mark van Alphen
25d06864e0 Merge pull request #2275 from Crazylemon64/no_giving_nodrops 
Fixes putting NODROP items onto humans
 2015-10-04 02:50:18 +02:00
Mark van Alphen
4e67b978fc Merge pull request #2273 from Crazylemon64/stickier_beakers_II 
Stickier beakers ii
 2015-10-04 02:49:51 +02:00
Crazylemon
ede190fc6d Does a small amount of further tweaking Topic() 
Watches out for NODROP trickery here. Haven't found where looting for
aliums or robots resides, though.
 2015-10-03 16:55:58 -07:00
Fox McCloud
57e5230add Merge pull request #2233 from Markolie/ShitStar 
AStar/Datastructures update
 2015-10-03 19:20:46 -04:00
Crazylemon
df847a617f Fixes putting NODROP items onto humans 
Fixes #2270, #2259
 2015-10-03 12:55:38 -07:00
Markolie
52d4135648 Ambulance/movement fixes 2015-10-03 21:33:40 +02:00
Crazylemon
e23b62ba80 Fixed the game/ side of the directory tree 
Also restructured the stuck message conditional so it's less likely I
made a mistake.
 2015-10-03 12:26:53 -07:00
Crazylemon
a9d19b9f11 i r gud at riting 2015-10-03 11:35:06 -07:00
Crazy Lemon
0b8375d02b Update icecream_vat.dm 
Missed a spot.
 2015-10-03 11:30:24 -07:00
Crazylemon
1607f64e06 Thoroughly flushes out every apparently obvious beaker drop exploit 
This also updates the formatting on a few devices and updates them to
use forceMove()
 2015-10-03 11:26:23 -07:00
Crazylemon
cbca437f9c Patches up all reagent_machines to not accept beakers 
I also patched up formatting and switched all .loc to .forceMove().
 2015-10-03 10:58:38 -07:00
Fox McCloud
bc651ce227 Merge pull request #2267 from Markolie/fixesfixesfixesfixesfixesfixes 
Bypass thick protection for syndicate borg hydro
 2015-10-02 19:40:29 -04:00
Markolie
6830928837 Bypass thick protection for syndicate borg hydro 2015-10-03 01:12:09 +02:00
Crazylemon
d4a37d2020 Reinserted positronic brains are now properly robotic 
Also tweaks the error message for operating on a meaty body
 2015-10-02 15:24:17 -07:00
TheDZD
8181354ffc Merge pull request #2261 from Markolie/fixesfixesfixesfixesfixesfixes 
Fixes
 2015-10-02 15:50:23 -04:00
TheDZD
de8e5ecfd0 Merge pull request #2254 from Markolie/swordnborg 
Syndicate borg update, add medical syndicate borg, energy sword refactor
 2015-10-02 15:49:57 -04:00
Markolie
a93304e673 Fix IPC brain surgery 2015-10-02 20:25:09 +02:00
Mark van Alphen
5f2fb9a7a4 Merge pull request #2250 from tigercat2000/xenoputers 
Remove remaining arbitrary restrictions
 2015-10-02 19:30:40 +02:00
Markolie
0ffc27eded Fix borer surgery 2015-10-02 05:54:33 +02:00
Markolie
4b8a5e226a Fix docility not updating when host is unconscious 2015-10-02 05:24:03 +02:00
Markolie
00fc1dd812 Move up related accounts in the player panel 2015-10-02 04:31:52 +02:00
Markolie
e27f84df7d Dead people can emote! 2015-10-02 03:59:03 +02:00
Markolie
7197a893e6 Switch AI announcement back to text input 2015-10-02 01:59:53 +02:00
Fox McCloud
5fe12d313a Merge pull request #2260 from Markolie/fixesfixesfixesfixesfixesfixes 
Fixes
 2015-10-01 19:43:05 -04:00
Markolie
f052512578 Fixes 2015-10-02 01:34:37 +02:00
Fox McCloud
62d25caec7 Merge pull request #2252 from tigercat2000/atommovablebuckling 
Move buckling to /atom/movable, can now buckle to mobs if adminbooze
 2015-10-01 19:01:39 -04:00
Fox McCloud
fc5641d926 Merge pull request #2253 from Markolie/darkness 
Make darkness clickable
 2015-10-01 17:11:31 -04:00
Markolie
1b10a3013c Surgery update 2015-10-01 23:10:16 +02:00
Markolie
e9188f7f38 AStar update 2015-10-01 20:18:05 +02:00
Markolie
6bae20b0a0 Syringe gun update, borghydro update 2015-10-01 19:30:42 +02:00
Fox McCloud
bc62bf7fa4 Merge pull request #2247 from Markolie/guns2 
Guns rename, take two
 2015-10-01 13:28:55 -04:00
Markolie
4b5664b2a8 Remove reagent containers from syndiborgs 2015-10-01 04:38:19 +02:00
Markolie
d40cfe582e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into swordnborg 
Conflicts:
	icons/obj/surgery.dmi
 2015-10-01 04:32:10 +02:00
Markolie
d18b18b5b4 Syndicate borg update, add medical syndicate borg, energy sword refactor 2015-10-01 04:21:24 +02:00
Mark van Alphen
3984d0a311 Merge pull request #2232 from Robertha89/patch-2 
Gives engineering more power at start
 2015-10-01 03:41:06 +02:00
Tigercat2000
413f35298e okay mark 2015-09-30 16:44:25 -07:00
Mark van Alphen
cf9a35479c Merge pull request #2220 from tigercat2000/more_ai_stuff 
Add a few variables to the AI announcment message
 2015-10-01 01:41:32 +02:00
TheDZD
d9f3cae655 Merge pull request #2231 from Markolie/hotkeys2 
Hotkey/interface update
 2015-09-30 19:40:49 -04:00
TheDZD
9b7b1c1913 Merge pull request #2217 from Markolie/s2 
Add AI text announcements
 2015-09-30 19:40:43 -04:00
Markolie
9ec1f3987c Make darkness clickable 2015-10-01 01:35:59 +02:00