cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 01:22:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,685 Commits 26 Branches 2 Tags
06ef8c94de23b2be6576f61ef4c3c70fea3a82e6
Commit Graph

3768 Commits

Author SHA1 Message Date
AffectedArc07
78cac40244 Merge pull request #14020 from kugamo/Fixes-some-outdated-posters 
updates 3 posters that had old tanks
 2020-08-16 12:55:16 +01:00
AffectedArc07
a15d3a2a7b Armor resprite (Sprites by Norstead) (#13638) 
* Armor resprite (Sprites by Norstead)

* Voxxy Sprites Yaya
 2020-08-14 20:25:43 -06:00
AffectedArc07
0aa89bd3de Merge pull request #13748 from Fox-McCloud/rig-purge 
Purges Rigs
 2020-08-09 18:21:39 +01:00
Kugamo
99fa2017e9 PERFECT! 2020-08-06 21:12:55 -05:00
Kugamo
4dcf19ade0 I must make sprites perfect 2020-08-06 21:07:54 -05:00
Kugamo
4091edf978 I adjust some pixels again 2020-08-06 16:17:06 -05:00
Kugamo
ec8da829fc reworked spriteo a smidge 2020-08-06 16:14:22 -05:00
Kugamo
5e440afe9b reworked the spirtes a tad 2020-08-06 16:03:01 -05:00
Kugamo
e7bed7a2a9 updates 3 posters that had old tanks 2020-08-06 15:42:12 -05:00
mochi
6085508428 Fix lipsticks 2020-07-24 18:33:15 +02:00
SteelSlayer
e8b64acaab Adds the airlock painter (#12687) 
* Adds the airlock painter

* 5 am push, pls don't break

* uses assoc lists, add do_after, painter attack_self

* more upgrades

* remove random whitespace

* better logic

* initial over new, flags, manually sort the list

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
 2020-07-13 15:52:34 -04:00
Pidgey
3095a3468e Makes Chicken Man statues in Mr. Chang's into real statues (#13721) 
* I think this is ok?

* Chicken Man and Kidan statues are now real statues that can be moved and disassembled (disassembly causes them to vanish without dropping materials as there are no bronze or obsidian stacks). Moved their sprites from decorations to statues for consistency.

* Oops! Metastation too.

* Finally got everything sorted out. Phew!

* The OXENbot on the derelict station is no longer a renamed chicken man statue. It can also be unanchored and sliced up for metal should you be inclined to do so.

* What even is this? Delete this.

* Coding standards

* Removed density variables from the changed statues.

* Fixes conflicts
 2020-07-13 14:23:56 -04:00
Fox McCloud
dd374ec1bd Merge pull request #13634 from ZomgPonies/ticketplease 
Ports HoP Ticket machine from tg
 2020-07-12 15:47:44 -04:00
Fox McCloud
38c9c508e6 Makes Ice Cream GC 2020-07-09 11:03:12 -04:00
Fox McCloud
c4143aedf0 Purges Rigs 2020-07-01 13:09:15 -04:00
Fox McCloud
93db61665d Speech bubble refactor and Features (#13598) 
* Speech Bubble Update and Refactor

* OBJECTION

* magistrate too

* args

* clean up and plug in atom say

* better
 2020-06-28 14:23:32 -06:00
ZomgPonies
2a313a91d5 Adds ticket dispenser 2020-06-17 15:27:30 -04:00
Luca
266a422e05 Merge conflict solved(?) 2020-06-14 01:50:07 +10:00
SteelSlayer
a93c4d9cdc Invisible cloning pod fix 2020-05-27 13:51:32 -05:00
Fox McCloud
9d755e4b00 Merge pull request #13446 from AffectedArc07/tcomms-overhaul 
Telecommunications Overhaul
 2020-05-25 18:51:58 -04:00
ZomgPonies
defbf5b6df Lizard skin handbag (#13477) 
* lizard handbag crafting recipe

* lizard handbag item

* lizard handbag sprites

* Fix styling of skin recipes
 2020-05-24 14:07:41 -04:00
Fox McCloud
40baacc405 TG Label Component Port (#13449) 
* TG Label Component Port

* every time I swear
 2020-05-24 13:55:05 -04:00
Fox McCloud
bf796cf8fc Ports Cybernetic Ears (#13438) 
* Ports Cybernetic Ears

* gosh darn new lines
 2020-05-24 13:54:54 -04:00
Fox McCloud
5c0b9386a6 Merge pull request #13443 from SteelSlayer/fire-cult 
Fire Cult sprite overhaul
 2020-05-22 22:58:03 -04:00
AffectedArc07
a10b0acb81 Merge branch 'master' into tcomms-overhaul 2020-05-22 18:51:44 +01:00
datlo
9fcb19126e Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into wizloadouts 2020-05-18 09:22:27 +02:00
TDSSS
630251a0ff Makes some space ruins easier to find. (#12647) 
* Added gps console to some space ruins

* adjusts gps naming/NEW

* Now actually works
 2020-05-17 18:45:28 -06:00
AffectedArc07
388acfa981 This state was not meant to exist 2020-05-16 15:22:36 +01:00
AffectedArc07
6bbdc99763 Sprite update (Thanks Drake) 2020-05-16 15:17:51 +01:00
AffectedArc07
8162a8ca25 Sprite update - Not done yet 2020-05-16 13:30:49 +01:00
SteelSlayer
849ce96ec9 Fire Cult sprite overhaul 2020-05-15 14:23:21 -05:00
AffectedArc07
64dc83846e Main part works. but we still got a long way to go 2020-05-14 22:46:26 +01:00
datlo
7b2c9d9564 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into wizloadouts 2020-05-02 10:25:05 +02:00
Lumi
7cc1493c79 Updates fluff. 
Updates Vox bodysuit to Kikeri's Dress.
 2020-04-17 15:20:38 +10:00
AzuleUtama
a6330d5977 Added sprite and updated compact rifle icon (#12825) 2020-04-10 22:39:18 -06:00
datlo
be91b68214 Add mime robe, plasmaman wiz outfit 2020-03-26 14:20:04 +01:00
datlo
61adc6abb9 Add wizard loadouts 2020-03-22 12:32:51 +01:00
Ty-Omaha
bb340f076d Kentucky Fried Vox (#13114) 
* is finger lickin goods yaya

* is code improvements yaya

* is updates yaya
 2020-03-17 15:12:52 -04:00
Fox McCloud
9d678f42af Merge pull request #13066 from Quantum-M/gameBooks 
SOP Books now read the SOP on the wiki and has new sprites
 2020-03-14 15:23:11 -04:00
Aquilar
b43f41ee47 making sure Rapaskoti's new icons work, and coding what they wanted to do. 
Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com>
 2020-03-04 14:27:41 +08:00
Bryan
ff585ccd04 Code and Sprite changes 2020-03-02 21:29:45 -07:00
variableundefined
611163d051 Merge pull request #12706 from Ty-Omaha/Uniforms 
Updates uniforms for naval officers
 2020-03-01 23:15:46 -05:00
Luca
3f89a00415 Adds IPC plushie and toast, toast is made via IPC plushie. 2020-01-09 17:59:34 +11:00
Lumi
e6090ea530 Adds vox-themed plushie. (#12745) 2019-12-17 22:32:24 -05:00
Ty-Omaha
da84345a67 Revert "Revert "Updates Naval Officer Outfit"" 
This reverts commit 24cdaeb413.
 2019-11-06 07:43:54 -05:00
Ty-Omaha
24cdaeb413 Revert "Updates Naval Officer Outfit" 
This reverts commit e6997dfdbe.
 2019-11-06 07:42:46 -05:00
Ty-Omaha
e6997dfdbe Updates Naval Officer Outfit 2019-11-06 07:42:33 -05:00
Darkmight9
19a29319de Decorations galore part 1! (#12615) 2019-10-27 00:30:05 -04:00
Fox McCloud
d6a6debf94 Traits framework (#12548) 2019-10-15 20:12:46 -04:00
Darkmight9
93b8750967 Re-adds the handheld defib sprites 2019-10-09 12:39:23 -04:00