cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 19:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,099 Commits 26 Branches 2 Tags
b8a9c902a1b3e2767dc0befebc8df5fcda376b40
Commit Graph

593 Commits

Author SHA1 Message Date
SamCroswell
b8a9c902a1 Removes Space Ninjas 2015-03-02 19:05:44 -05:00
ZomgPonies
6979cf6089 Merge pull request #477 from Fox-McCloud/Chemistry-Cleanup 
Chemistry Cleanup and Fixes
 2015-03-01 23:08:16 -05:00
Fox-McCloud
3bed31e08c Chemistry Cleanup and Fixes 2015-03-01 16:34:23 -05:00
ZomgPonies
2b917b17cd Merge pull request #475 from Markolie/master 
Bug fixes galore
 2015-03-01 14:41:42 -05:00
Markolie
d7a2559065 Bug fixes galore 2015-03-01 20:35:07 +01:00
ZomgPonies
7799470ca5 Merge pull request #460 from Markolie/master 
Add bandanas, mask toggling, camo armor jacket, minimum drone/ERT age, turret update, NanoUI update and bugfixes
 2015-03-01 12:30:15 -05:00
Mark van Alphen
18692eedfe Merge pull request #450 from ZomgPonies/fixuns 
More fixins and various features
 2015-02-28 17:33:28 +01:00
Markolie
e4328a7f5e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
 2015-02-28 17:13:53 +01:00
Markolie
f7426c8d72 Add bandanas, mask toggling, camo armor jacket and bugfixes 2015-02-28 17:09:45 +01:00
ZomgPonies
89ce02b426 Merge pull request #451 from Markolie/master 
Temperature fixes
 2015-02-28 09:48:01 -05:00
Markolie
a735e6855c Reduce malf ticker time, update fire damage, fix breathing 2015-02-28 15:44:43 +01:00
ZomgPonies
2a18787c50 Merge pull request #447 from Fox-McCloud/Shields 
Telescopic Riot Shield
 2015-02-28 09:07:07 -05:00
ZomgPonies
f27ccb6f4d Owlman/Griffin toys/posters/barsign 2015-02-27 13:24:45 -05:00
Markolie
20ac07de8d Bug fixes 2015-02-27 17:51:57 +01:00
Fox-McCloud
30465b03d6 Telescopic Riot Shield 2015-02-27 07:31:03 -05:00
ZomgPonies
d14c4e4f58 Merge pull request #431 from Fox-McCloud/Lasers-Tasers 
Laser Additions and Taser Nerf
 2015-02-26 22:49:46 -05:00
ZomgPonies
2f9b435a0f Merge pull request #426 from Markolie/master 
Bug fixes, add atmos watertank
 2015-02-26 13:50:37 -05:00
Fox-McCloud
9850e6deb2 Laser Additions and Taser Nerf 2015-02-25 23:34:42 -05:00
Markolie
bfe8a12f1e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/game/objects/items/weapons/kitchen.dm
 2015-02-25 20:44:32 +01:00
ZomgPonies
887e4b93f7 Ported outside crate manifest 2015-02-25 14:02:14 -05:00
Markolie
e1f0d0fec7 Bug fixes, add atmos watertank 2015-02-25 19:47:04 +01:00
ZomgPonies
5c14d9c5f2 vg Garbage Collector 2015-02-23 17:18:38 -05:00
Markolie
8f5bddbb32 Fix compile error 2015-02-22 22:29:58 +01:00
Markolie
672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
Markolie
377dfe894d Add attack animations 2015-02-22 21:15:54 +01:00
Markolie
72db213067 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/game/jobs/job/support.dm
	code/setup.dm
 2015-02-22 19:12:11 +01:00
Markolie
982102a407 Standardize mutations 2015-02-22 19:04:43 +01:00
Markolie
3b072b5a62 Remove click delay from most things 2015-02-22 18:47:58 +01:00
ZomgPonies
1f5ef8d4dd Merge pull request #380 from Markolie/master 
Adds celsius to the freezer/heater, crafting update
 2015-02-22 08:30:11 -05:00
ZomgPonies
1c1ebc3f3f Merge pull request #383 from Fox-McCloud/Syndi-Hardsuits 
Syndi hardsuits
 2015-02-22 08:27:38 -05:00
Markolie
efb45ea228 Table crafting refactor 2015-02-22 01:50:57 +01:00
Markolie
cb732b2b2d Adds celsius to the freezer/heater 2015-02-21 22:14:02 +01:00
Markolie
9fedfc7c62 Switch copytext and sanitize proc 2015-02-20 22:17:13 +01:00
Markolie
d8d1670b68 Revert "Revert "Saycode/language/species port from Bay"" 
This reverts commit d54579850c.

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/objects/items/devices/radio/intercom.dm
	code/modules/mob/living/silicon/pai/pai.dm
 2015-02-20 17:46:35 +01:00
Fox-McCloud
be2e754706 Syndicate Rebalance 2015-02-20 03:14:12 -05:00
DZD
212ca5f5bd MERGE CONFLIIIIIICTS 2015-02-19 20:26:36 -05:00
ZomgPonies
d54579850c Revert "Saycode/language/species port from Bay" 2015-02-19 20:15:42 -05:00
DZD
d0d6c8eebd Merge with upstream/master 
Fixes merge conflicts.
 2015-02-19 19:38:48 -05:00
DZD
c11bb0d283 Fixes bugs 
- Tables can't have NODROP or ABSTRACT items placed on them anymore,
same for lockers and crates.
- Fixes a runtime with trying to strip a NODROP or ABSTRACT item.
 2015-02-19 19:32:58 -05:00
Markolie
46c53be6f1 Part 2 of saycode/language/species port from Bay. Also includes bugfixes. 2015-02-20 00:50:28 +01:00
DZD
4bcdb94a99 Merge with upstream/master 
Fixes conflicts
 2015-02-18 13:41:32 -05:00
DZD
fbd9c367c0 NODROP flag addition & handling 
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
 2015-02-18 13:22:41 -05:00
Markolie
f5e2d82953 (Plasma decal already fixed) - Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/game/machinery/atmoalter/canister.dm
 2015-02-17 02:12:22 +01:00
Markolie
ad167dc541 Announcement system overhaul, crew monitor system overhaul, add portable crew monitor 2015-02-16 19:03:29 +01:00
Mark van Alphen
3bc771b15b Merge pull request #314 from Fox-McCloud/Cargo 
Cargo
 2015-02-16 06:52:16 +01:00
Fox-McCloud
1fdd281f19 Critter Crate Fix 2015-02-15 03:19:43 -05:00
Fox-McCloud
dbf4c84953 Merge pull request #311 from Markolie/master 
Ziptie restraint examine, fax panel adjustment
 2015-02-14 23:23:35 -05:00
Fox-McCloud
1e4d1df880 Merge remote-tracking branch 'upstream/master' into Cargo 2015-02-14 22:02:39 -05:00
Fox-McCloud
0de7e1035c Cargo Supplies 2015-02-14 21:21:09 -05:00
Markolie
0792a40379 Add zipties to secvender, replace box of handcuffs in warden's locker with zipties box 2015-02-14 22:31:31 +01:00