cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-25 15:24:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,334 Commits 10 Branches 2 Tags
e055bbb8471511bfb1a2d38dbfeb92a33db81aab
Commit Graph

2531 Commits

Author SHA1 Message Date
Markolie 51035f931e Powernet rework 2015-07-31 23:59:41 +02:00
Markolie 660ffad9a0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/modules/power/port_gen.dm
 2015-07-30 03:08:33 +02:00
Fox-McCloud 1ee7853d65 Merge pull request #1476 from TheDZD/mining2 
Mining Overhaul [Soon™]
 2015-07-29 20:51:24 -04:00
Fox-McCloud e517d172be Banana Grenade Fix 2015-07-28 21:44:46 -04:00
Markolie b8a7ca7d1b Update NanoUI to be up-to-date with Bay 2015-07-28 21:04:44 +02:00
Markolie 154a282a0d NanoUI caching for cameras/crew manifest 2015-07-28 19:54:17 +02:00
Markolie c67bb095fb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-07-28 18:40:44 +02:00
Markolie 27ec05589b Missing qdel 2015-07-28 17:31:39 +02:00
Markolie 706d19c24f Reference/typo fixes 2015-07-28 17:28:56 +02:00
Markolie b6e446c446 NanoUI traitor uplink 2015-07-28 06:28:01 +02:00
Fox-McCloud eb694a50eb Updates Nuke Disk Spawning 2015-07-24 17:33:25 -04:00
DZD 66688f4dbb Fixes conflicts in icons/obj/gun.dmi. 2015-07-24 15:29:20 -04:00
Fox-McCloud 0945859066 Merge pull request #1554 from Markolie/master 
Fix OneHuman law
 2015-07-22 16:57:23 -04:00
Markolie 4cfd1e4340 Fix OneHuman law 2015-07-22 18:35:09 +02:00
SamCroswell d84dfe5a49 ERT Rework - Code Changes 2015-07-20 19:37:56 -04:00
Matt a106daa447 Holopad and binary talk 
Fixes https://github.com/ParadiseSS13/Paradise/issues/1517 and
https://github.com/ParadiseSS13/Paradise/issues/1483 Aboot it
 2015-07-16 14:44:51 +02:00
DZD 29e70854e9 Fix merge conflicts 
🖕 map conflicts over lines that weren't even edited by both upstream
and this branch.
 2015-07-15 22:28:12 -04:00
Fox-McCloud 409fefa4b3 Power Computer and Computer Fixes 2015-07-15 07:00:46 -04:00
Krausus 6376907560 Further fixes to morgues and crematoriums 2015-07-14 04:08:56 -04:00
Fox-McCloud e4d6acb538 Changes a few del to del() 2015-07-10 23:28:08 -04:00
DZD 3ed90434e0 Projectile, borg, and RnD fixes. 2015-07-10 21:36:23 -04:00
DZD 412443dbf1 Fix non-icon merge conflicts 2015-07-10 19:57:59 -04:00
DZD d4cf433e7c Various fixes, changes, additions, and removal of old features. 
More changes
 2015-07-10 19:41:27 -04:00
Fox-McCloud 068adc1f0a Shard Runtime Fix 2015-07-10 05:44:29 -04:00
TheDZD 333eb83dee Merge pull request #1477 from Fox-McCloud/chameleon 
Updates Chameleon Projector
 2015-07-09 22:39:32 -04:00
Fox-McCloud 54f59b9899 Pass II 2015-07-09 19:51:40 -04:00
DZD 916f9bf4bb Sort of compiles 
Time to fix xenoarch, and then the map.
 2015-07-09 15:55:36 -04:00
Fox-McCloud 0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
Fox-McCloud a117067123 Updates Chameleon Projector 2015-07-08 18:09:27 -04:00
Fox-McCloud 6e87b96501 Pass 3 2015-07-08 01:34:53 -04:00
Fox-McCloud 0fd80d0b1f pass one fix 2015-07-08 01:09:10 -04:00
Fox-McCloud 9dc27ce126 Destroy Pass II 2015-07-07 22:26:28 -04:00
TheDZD b02cd94168 Merge pull request #1467 from Fox-McCloud/del-the-dels 
Replaces Remaining Del()'s
 2015-07-07 19:07:53 -04:00
Fox-McCloud 40c047f89a Merge pull request #1464 from tigercat2000/gibtoy 
Minigibber toy
 2015-07-07 16:35:36 -04:00
Fox-McCloud 561e0c2268 pass 3 and cleanup 2015-07-07 01:32:40 -04:00
Fox-McCloud 88dfaa51a4 Replaces Reamining Del()'s 2015-07-07 00:35:19 -04:00
Tigercat2000 997d616b62 Minigibber toy 
This commit adds a miniature gibber toy (/obj/item/toy/minigibber), which
uses a downscaled sprite of the gibber.

Features:
 - Plays a gibbing noise when you click on it with itself, cooldown of 8
   ticks applies.
 - It's a miniature gibber.
 - Custom attack verbs (grinded, gibbed)
 - Feed DnD minifigures into it for REALISTIC GIBBING ACTION (tm)
 - Obtain from arcade machine or cargo store (400 credits)

** SQUASHED COMMITS **

Minigibber name-spellchecking

Protip: Miniature is actually spelled mini-ature, not min-ature.

Minigibber minifigure eating action!

You can now shove minifigures into the Minigibber, then click on it with
itself to tear them apart! GIB! GIB! GIB!

Make minigibber obtainable

Via arcade machine and cargo store (400 credits)

Minigibber desc now says grinder...

instead of meat producing machine. Because it's really just a giant
grinder, and that will match the store item description.

Readd gibbing sound to minigibber, mistakenly removed it earlier.
 2015-07-06 17:15:54 -07:00
Tigercat2000 3a45d52fe0 Fix remaining non-returning Destroys() 
Plus a little refactor to mining flaps and spacepod doors- they now use
CanAtmosPass instead of manually setting the turf to no-atmos-passing
 2015-07-06 09:20:39 -07:00
TheDZD b38d741801 Merge pull request #1446 from Fox-McCloud/pools-and-fires 
Pools Hotspots
 2015-07-05 17:51:20 -04:00
TheDZD 59b154e8cb Merge pull request #1452 from Fox-McCloud/parents-and-procs 
Tweaks a Few Destroy()'s
 2015-07-05 17:51:03 -04:00
Fox-McCloud 44881a4016 Tweaks a Few Destroy()'s 2015-07-05 04:51:47 -04:00
Fox-McCloud ab28186d13 Kill is Kill 2015-07-04 19:27:43 -04:00
Fox-McCloud 9e94e40db6 PDA 2015-07-02 02:26:47 -04:00
Fox-McCloud 389eab6e32 Analyzer Scan Refactor 2015-07-02 02:01:13 -04:00
Fox-McCloud 62ef1cb7e2 TG Supermatter Port 2015-06-30 21:07:08 -04:00
Fox-McCloud c2567b92a8 Merge pull request #1414 from SamCroswell/martialarts 
Thunderdome and Admin Room Changes
 2015-06-30 16:55:10 -04:00
TheDZD 524fa94205 Merge pull request #1407 from Fox-McCloud/Chainsaw-tweak 
Chainsaw Tweaks
 2015-06-29 18:35:23 -04:00
SamCroswell ebabf9f7bb Map Edits, Minor Fixes 2015-06-29 16:22:59 -04:00
Fox-McCloud af2410c3f8 Fixes Pizza Bomb Pathing 2015-06-28 18:56:02 -04:00
Fox-McCloud eec810647a Chainsaw Tweaks 2015-06-28 15:58:04 -04:00