cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 12:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,883 Commits 26 Branches 2 Tags
cbca437f9c79ef15a006fbace87d11542e27b74f
Commit Graph

11059 Commits

Author SHA1 Message Date
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
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
Tigercat2000
575362b0f4 Move buckling to /atom/movable, can now buckle to mobs if adminbooze 
Also changed:
 - Comment clarifying what buckle_lying = -1 means
 - Changes direction of lying on operating tables, somehow missed it
 2015-09-30 15:29:47 -07:00
Robertha89
36115ed8aa Disregard that 2015-09-30 21:23:43 +02:00
Robertha89
f07a82936f Magical SMES for consistancy 2015-09-30 21:22:43 +02:00
Robertha89
1a463b75f0 Reduce starting power 2015-09-30 21:21:10 +02:00
Mark van Alphen
7565da30ec Merge pull request #2216 from Aurorablade/YETMOREBLOOD 
In whitch the Slaughter demon gets changed
 2015-09-30 20:40:48 +02:00
Tigercat2000
e39c69a8a6 Change paper to work based on say_understands; 
This means that if you have galactic common in your languages, or
understand/speak all languages, you can also read paper.
 2015-09-30 11:12:16 -07:00
Tigercat2000
c4fa813331 Remove remaining arbitrary restrictions on has_fine_manip 
This commit removes all (most) of the remaining code limiting xenomorphs
that have has_fine_manipulation on an entirely arbitrary basis. Xenomorphs
with has_fine_manipulation may now interact with NanoUI, and will only
break computers on non-help intent. The can also tear down walls, since
walls used an ishuman check in place of an isAdvancedToolUser check as
they should have.

Minor refactor to machinery.dm as well; Instead of the slightly
(completely) insane attack_hand restriction to humans and silicons (it was
a multi-line IF, why), it now checks user.IsAdvancedToolUser(); This means
restrictions on monkies will actually function properly now.
 2015-09-30 10:50:10 -07:00
Tigercat2000
b5218bfb5c Fixes monkey cubes, more or less 
They will now unEquip() if they are in a mob, therefore clearing the hand
ref to them.
 2015-09-30 09:34:11 -07:00
Markolie
6f0a8174ad Guns rename, take two 2015-09-30 15:51:14 +02:00
Fox McCloud
f000c0c225 Merge pull request #2238 from Markolie/emotes 
Add cooldown to chirp emote, dsay fix
 2015-09-29 22:37:31 -04:00
Mark van Alphen
f10fd6e1ee Merge pull request #2212 from Spacemanspark/master 
Makes *deathgasp less snowflakey
 2015-09-30 04:30:53 +02:00
Markolie
1a7c565482 Fix 2015-09-30 03:38:44 +02:00
Markolie
9277a2f55e Dsay fix 2015-09-30 03:35:30 +02:00
Markolie
8d99c8c689 Add cooldown to chirp emote 2015-09-30 03:04:15 +02:00
TheDZD
d84868d43f Merge pull request #2229 from Markolie/hotkey 
Admin PM fix
 2015-09-29 20:25:56 -04:00
Aurorablade
fad133c70c trying this whole force move dealy... 2015-09-29 19:37:57 -04:00
Markolie
3c0931ba7d Better hotkey mode handling 2015-09-30 01:34:51 +02:00
Markolie
85009d81d8 Sanity checks 2015-09-30 01:26:22 +02:00
Markolie
a2c05f45d4 Reboot fix 2015-09-30 01:12:31 +02:00
Robertha89
7184df0aac Fixes Name issue and gives engineering more power 
Very often now, this is how the round starts, power starts going out, engineers does nothing, nobody does anything, and there are so many rounds where the power runs out station wide, i.e it takes an hour to set up power, this will buff the starting power of engineering, so that power does not start running out during the first half hour of the shift.

Also, fixes the name back to SMES.

This can be considered a somewhat controversial pull.
 2015-09-30 01:06:25 +02:00
Markolie
8ad7eb56c2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into hotkeys2 
Conflicts:
	config/example/config.txt
 2015-09-30 01:04:45 +02:00