cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-21 06:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,197 Commits 8 Branches 0 Tags
462effc1d20ae5e6aeffe87f6019ba767be59593
Commit Graph

6956 Commits

Author SHA1 Message Date
Anewbe
ab9f296adb Merge pull request #4837 from Schnayy/giftitems 
Gift items + Cargo crate
 2018-02-16 12:52:59 -06:00
Anewbe
004ff0166d Merge pull request #4822 from VOREStation/pol-sa-playerqol 
Player-controlled SA QoL
 2018-02-16 12:52:14 -06:00
Anewbe
79b8c283f7 Merge pull request #4845 from Heroman3003/grill-typo 
Fixed typo in unfastening grille
 2018-02-16 12:50:18 -06:00
Anewbe
2f4df23c0b Merge pull request #4841 from MisterLayne/space_grilles 
Allows you to grille in space.
 2018-02-16 12:46:07 -06:00
Aronai Sieyes
15a5e5e10b Merge branch 'master' into pol-sa-playerqol 2018-02-15 21:56:53 -06:00
Heroman3003
bd6ef1b09f Fixed typo in unfastening grille 
Grille, not grill
 2018-02-16 11:38:12 +10:00
Anewbe
cd0394c88b Merge pull request #4834 from VOREStation/pol-borgbright 
Fixes lack of borg fullbright with mesons etc
 2018-02-15 19:12:33 -06:00
MisterLayne
87d1c85534 I will fite these '<<'s. 2018-02-15 17:16:02 -05:00
BillyBangles
f5dfbff1bd Build igloos and snowmen (#4811) 
* adds packed snow brick material

* makes snow walls spawnable for mapping

* adds snowmen

craft them with snow. duh.

* snow spider triggers arachnophobia

also changelog.
 2018-02-15 14:25:51 -06:00
Anewbe
7e2df51283 Changes mine code, adds random mine spawners (#4817) 2018-02-15 12:19:58 -08:00
Schnayy
02447e5c19 The largest PR I've probably actually done. Adds the following: 
* Bouquets
* Fake Bouquets. Can be won from arcade machines.
* Heart box chocolates containing a set arrangement of chocolates.
* Adds said chocolates (milk chocolate, white chocolate, and truffles) all bite-sized.
* Adds 5 cards, one blank and four with covers. Function identical to paper except you can't make an airplane because I hate fun.
* Adds The four cards with covers, 3 real bouquets, and 2 chocolate boxes to cargo under a 'gift crate' for 10 points.

Sprites by me. Code would not be possible without cerebul's help. Let me know if I've goofed on something, but I did test all of the items + ordering them from cargo.
 2018-02-15 03:33:23 -06:00
Arokha Sieyes
edd24126aa Fixes lack of borg fullbright with mesons etc 2018-02-15 03:10:04 -06:00
Arokha Sieyes
894b1b32c2 POLARIS: Lets animals and ghosts look in boxes 2018-02-15 02:04:11 -06:00
Arokha Sieyes
e248b89b7b POLARIS: Player-controlled SA QOL 2018-02-15 01:49:53 -06:00
Anewbe
ca7e771aca Merge pull request #4809 from Mechoid/Modkits 
Suit Modkit Compatability
 2018-02-13 10:41:35 -06:00
Anewbe
51d425b1b8 THE MINI FIST-PUNCH UPDATE (#4804) 
* VARIOUS FISTICUFFS RELATED CODE CHANGES
 2018-02-12 23:17:35 -08:00
Anewbe
534a588a6a Gun changes (#4185) 
* Various background gun changes

* Forgot to include the sounds, woops

* Fixes some more gun stuff

* Makes the cham gun work again
 2018-02-12 23:12:14 -08:00
BillyBangles
ef86caf177 Adds decorative bones and bone loot pile (#4800) 
* adds various bones and bone loot pile

credit to schnayy for most of these sprites

* removes the crossbow bolt from the loot list
 2018-02-12 22:13:47 -06:00
Cyantime
a2f3443828 SMES tweaks (#4793) 
* SMES tweaks

* Replace some fireloss with electrocute_act
 2018-02-12 20:39:58 -06:00
Mechoid
96da0430bc Prod suit modkits 2018-02-12 13:10:26 -08:00
Mechoid
e28b66b700 Makes Tape work on Nerds, and people without eyes. (#4791) 2018-02-11 19:02:22 -08:00
Anewbe
6f2c47e5a9 Trees take damage from bullets/lasers (#4786) 2018-02-11 18:57:20 -08:00
Anewbe
922506f56a Merge pull request #4790 from Atermonera/obfus_gps 
Lets poi gps units display gps_tag instead of hardcoded string
 2018-02-11 01:54:18 -06:00
Atermonera
2427dceb37 Lets signal names be mapped 2018-02-10 15:51:49 -08:00
Anewbe
252b2ffa1c Merge pull request #4772 from Atermonera/obfus_gps 
GPS coordinates and POI names are obfuscated
 2018-02-10 17:51:48 -06:00
Anewbe
78042b8db6 Merge pull request #4760 from Neerti/2/8/2018_door_assembly_fix 
Makes Projectiles Sometimes Pass Through Door Assemblies
 2018-02-10 01:55:38 -06:00
Atermonera
05c62ba9eb Adds EMP mines (#4679) 
* Revert "Update #3? 4?"

* Revert "Revert "Update #3? 4?""

* Adds the disabled mech tools.

* indentation

* Counter-update

* Refactors mine code. Adds emp mines.

* Hecking spaces

* It compiles this time. For real, I swear
 2018-02-10 01:53:54 -06:00
mistyLuminescence
fa6ff94474 What's Yours Is Mined (#4556) 
* Boom!

* Wires!
 2018-02-09 18:56:46 -08:00
atermonera
fae9c63ccf GPS coordinates and POI names are obfuscated 2018-02-09 16:59:03 -08:00
Mechoid
736134d10f Merge pull request #4707 from Cerebulon/virologyRetoothing 
Gives Virology teeth again
 2018-02-09 11:49:45 -08:00
Mechoid
251297a2ba Promethean Balancing, Lore-compliant Modification of Security Equipment (#4722) 
* Works on Balancing Prometheans

* Reorganize from Master Merge

* Tries to fix that gun conflict that the DMI merger apparently did fine?
 2018-02-08 14:58:17 -06:00
Anewbe
1642848db7 Merge pull request #4754 from VOREStation/vplk-id-refactor 
Fix IDs so they do not instantiate every job datum on New
 2018-02-08 14:32:42 -06:00
BillyBangles
64b98e0dae Adds 2 new cave POIs (#4743) 
* adds temple and ritual POIs

as well as ever-burning candles, a candleabra, and a neat red crystal that looks like supermatter but isn't

* fixes all cases of 'candelabra' spelling

i am a dunce

* fixes main map changes

i don't even know what i fuckin did to this thing??? ?? ??? ???

* removes unnecessary light() proc
 2018-02-08 14:10:02 -06:00
Neerti
a38e66305b Makes Projectiles Sometimes Pass Through Door Assemblies 
What it says on the tin.
 2018-02-08 04:37:21 -05:00
Anewbe
a80f9d345e Merge pull request #4746 from Cyantime/defibruntime 
Fix paddle runtime
 2018-02-07 23:34:44 -06:00
Anewbe
ce92a992ca Merge pull request #4747 from Woodratt/02062018_MapfixesShuttleupgrde 
Shuttle Upgrades and Map Fixes
 2018-02-07 23:33:33 -06:00
Leshana
f741bba7cb Fix IDs so they do not instantiate every job datum on New 
Every ID was instantiatating and deleting a copy of *every* job datum in its New().  Thats silly.  Switch to initialize so job_master is available.
 2018-02-07 16:38:37 -05:00
Woodratt
7ee2b5266a Shuttle Upgrades and Map Fixes 
- Upgrades the shuttles with enviroment sensors and the ability to see if the rear hatch is open.
- Gun cabinets station side in the hangar control rooms. Explorer, Pilot, Armory Access.
- Surgery room redesign, replaced closets with wall closets.
- Multiple other smaller map bug fixes.
 2018-02-06 22:58:44 -08:00
Cyantime
5816d717f7 Fix paddle runtime 2018-02-06 23:57:44 -05:00
Cerebulon
d592d1fc17 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into virologyfixes 2018-02-07 03:40:06 +00:00
Anewbe
0d7fc11540 Merge pull request #4736 from elgeonmb/patch-4 
moves us out of kara, pt 2
 2018-02-06 21:07:56 -06:00
Neerti
3fd1571a4b Merge pull request #4724 from Anewbe/ghettoChutes 
Fixes ghetto chutes
 2018-02-06 14:14:30 -05:00
elgeonmb
b0fd486e27 moves us out of kara, pt 2 2018-02-05 23:22:45 -08:00
Neerti
828b594701 Merge pull request #4716 from VOREStation/vplk-ss-atoms-shuttles 
Atom Initializing and Shuttles Subsystem + CALLBACK
 2018-02-05 23:39:47 -05:00
mistyLuminescence
d04faba6c4 Machetes now fit on belts (#4725) 
* Knives and machetes now fit on belts

* just machetes
 2018-02-05 22:29:37 -06:00
Leshana
5847319443 Update every initialize() proc to return an initialize hint. 
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
 2018-02-05 15:50:13 -05:00
Anewbe
08e44f8a5a Merge pull request #4721 from mistyLuminescence/syndietoolbox 
Fixes syndie powertool toolboxes
 2018-02-05 01:57:02 -06:00
Anewbe
3e31b6678f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into ghettoChutes 2018-02-05 00:53:33 -06:00
Anewbe
67e22cf0a6 Closets and Mechs no longer prevent death by freefall 2018-02-05 00:53:12 -06:00
mistyLuminescence
da4bd82a5d Adds more med gear to R&D and Cargo (#4691) 
* Adds more med gear to R&D and Cargo

* standardises + adds sprites

* Removes cargo crate
 2018-02-04 22:18:36 -06:00