cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,086 Commits 5 Branches 0 Tags
6c903907c03dbe2485d319170c024bb076e545d3
Commit Graph

353 Commits

Author SHA1 Message Date
Zuhayr
04d1b40e3d Merge pull request #9626 from GinjaNinja32/vine_event_fix 
Fixes vine/infestation events not working with new lighting
 2015-06-03 04:00:21 +09:30
Zuhayr
fe37da05ce Merge pull request #9639 from PsiOmegaDelta/150602-EyeTracking 
Eye mobs are now listed in the observer tracking list.
 2015-06-03 03:59:58 +09:30
GinjaNinja32
24adb8eb42 Fixes vine/infestation events not working with new lighting 
Also adds a helper for finding whether there are any simulated atoms on a turf
 2015-06-02 16:56:10 +01:00
PsiOmegaDelta
de97e18e5f Eye mobs are now listed in the observer tracking list. 
Fixes #9636.
 2015-06-02 15:41:14 +02:00
PsiOmegaDelta
fcb0841646 Reduction of admin right-click verbs. 
Removes verbs which only works on specific mob types from the admin right-click context.
Fixes #9627.
Fixes #9628.
 2015-06-02 14:20:14 +02:00
Chinsky
ff592c751a Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks 
End game tweaks
 2015-05-31 23:55:08 +03:00
PsiOmega
5e84bfa57c Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/clothing/spacesuits/rig/suits/ert.dm
 2015-05-30 15:59:54 +02:00
PsiOmega
4ce737d87d Server build date and revision. 
Can now see the current compilation date and revision:
* In the Dream Daemon log output.
* By using the "Show Server Revision" client verb which also links you to the commit in question.
 2015-05-29 08:26:31 +02:00
mwerezak
1d5c971a45 Fixes #9452 2015-05-26 22:34:06 -04:00
PsiOmega
bcb1ea5413 Endgame tweaks. 
Now instead calls the proper round-end proc when finishing the round, allowing admins to interrupt restart if desired.
None of the current end game variants currently use over/underlays, they are now content with coloring space.
On endgame start, the entire world is now updated in a spawn() instead, reducing crippling lag.
Adds support to designate APCs are critical, these are not drained during world end events.
Fixes a couple of potential runtime errors if no escape points have bee mapped in.
People in wheelchairs and mechas can now enter the world end rift.
Cult walls no longer cultify over and over, indefinitely.
 2015-05-26 12:29:50 +02:00
PsiOmega
c77f7eacb7 Fixes #9210. 
Now acquires the max element from Z-level lists, not the max list.
 2015-05-12 08:11:48 +02:00
Zuhayr
6f41625752 Added construction drone sprites from Pawn. 2015-05-11 14:46:47 +09:30
Mloc
16d50c645d new object-based lighting system 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 20:54:25 +01:00
Mloc
e602a7e286 remove the sub-area system 
Removes area/list/related and area/master.
They were only used by the old lighting subarea system.

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 17:06:29 +01:00
StarSmasher
09b92c347f Optimises uniqueList() 
Credits go to /TG/, I just figured I'd do what the other codebases do and take it over for us as well.

Changes:

Optimises uniquelist()
also renames it from uniquelist() to uniqueList()
Test 1:

1,000,000 random numbers between 1 and 7 in a list.
Clean out duplicates with current uniquelist(), once:
self: 0.362
Clean out duplicates with my new uniqueList(), once:
self: 0.184

Test 2:

3,000,000 random numbers between 1 and 7 in a list.
Clean out duplicates with current uniquelist(), once:
self: 1.069
Clean out duplicates with my new uniqueList(), once:
self: 0.496
 2015-05-10 16:59:32 +02:00
PsiOmega
27b917ed6c Teleport cleanup. 
Teleporter code now uses:
Absolute paths.
Span classes.
Configured Z-levels to determine valid destinations, as opposed to hardcoded.
 2015-05-05 09:55:19 +02:00
PsiOmega
1edb39b556 Merge remote-tracking branch 'upstream/dev' into BrokenGrills 2015-05-04 14:58:24 +02:00
PsiOmega
3866fda394 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/ZAS/Turf.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living.dm
	code/modules/recycling/sortingmachinery.dm
 2015-05-02 21:50:11 +02:00
PsiOmega
ca7fa2aa19 Grilles and rods. 
Grilles no longer return more rods than they were created from when destroyed (by method other than wirecutters).
Rods are now acquired from and returned to a pool.
Also adds a pre-broken grille for mapping, avoids the case where one might be able to destroy the same grille twice.
 2015-05-02 21:35:02 +02:00
mwerezak
fbede7a193 Minor ZAS-related cleanup 2015-04-28 23:00:56 -04:00
PsiOmegaDelta
851d5423f3 Merge pull request #8971 from mwerezak/burst-fire 
Gun firemode system, burst firing
 2015-04-28 20:24:03 +02:00
Kelenius
d9e2947b32 Updates chemistry colors 2015-04-28 09:23:39 +03:00
mwerezak
f1c2cbe519 Adds gun firemodes and burst firing 
Adds support for different gun firemodes, and defines firemodes for various automatic weapons, as well as the double-barreled shotgun
 2015-04-26 03:13:52 -04:00
mwerezak
5fed768053 Fixes rounding in returned vector locations 
Fixes a rounding issue in returned vector location that would cause
returned projectile trajectories to be biased towards the lower left
corner of the map.
 2015-04-24 17:58:50 -04:00
PsiOmega
1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning 
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm
 2015-04-24 17:13:37 +02:00
PsiOmega
e7d85f8edc Adds Destroys. 2015-04-24 17:11:14 +02:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object. 
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
 2015-04-24 09:59:05 +02:00
volas
b2011c6940 Return strip_html_properly() back 2015-04-21 00:38:41 +03:00
Chinsky
940b5c8c62 Merge pull request #8891 from volas/sanitize3 
sanitize() 3
 2015-04-19 14:59:36 +03:00
volas
7dedbc6d78 Alternative copytext, safe for html entities 2015-04-19 12:37:04 +03:00
Zuhayr
0b03a389df Merge pull request #8910 from Baystation12/master 
Master into dev
 2015-04-19 17:26:04 +09:30
PsiOmega
a4fbb01e2b Makes it possible to write [date] and [time] to get the current date and time in ISO 8601 format. 2015-04-18 18:40:35 +02:00
PsiOmega
a3fb012332 Updates the atom_pool, now datum_pool, to handle any datum object. 2015-04-17 10:37:47 +02:00
Chinsky
9377932b30 Made get_area return master to avoid usual pitfalls with lighting subareas breaking everything 2015-04-15 16:12:47 +03:00
PsiOmega
516b60962e Merge remote-tracking branch 'upstream/dev' into CultPorting 2015-04-14 15:54:22 +02:00
PsiOmega
1511e2b3f4 Ports /vg/'s Nas-Sie remake. 
Second phase:
New Nar-Sie itself.
Two endgame phase - Nar-Sie and Supermatter Cascade.
Culty mobs.
 2015-04-12 16:19:16 +02:00
Zuhayr
0223223c77 Merge pull request #8753 from Neerti/4-4-2015_borg_module_stuff 
Revenge of the Research Module (and other stuff from that PR)
 2015-04-12 13:16:45 +09:30
PsiOmega
9181a2a43a Fixes atom pooling return code. 2015-04-11 10:28:15 +02:00
=
78987a436a Merge resolution. 2015-04-11 13:23:17 +09:30
PsiOmega
990530d118 Ports /vg/'s spell system for the sake of cult porting. 
Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.
 2015-04-09 20:08:06 +02:00
Chinsky
e6f83f8fa2 Merge pull request #8707 from PsiOmegaDelta/Garbage 
Ports /vg/&/tg/'s garbage collector.
 2015-04-09 08:50:12 +03:00
Chinsky
4a897e47b9 Merge pull request #8641 from PsiOmegaDelta/CultVisualNetwork 
Cult Visual network
 2015-04-06 20:19:49 +03:00
Neerti
326fde4c5f Adds the research module, condensed into one commit so far. 2015-04-04 20:17:59 -04:00
volas
2622d2dbfc sanitize() refactor: fourth pass 2015-04-03 00:40:57 +03:00
PsiOmega
c305b389f7 Ports /tg/'s & /vg/'s garbage collector/object pool. 
It's happening. Kind of, the code is there.
 2015-04-02 14:48:28 +02:00
PsiOmega
a9034bca66 Merge remote-tracking branch 'upstream/dev' into CultVisualNetwork 
Conflicts:
	code/modules/mob/living/simple_animal/shade.dm
	code/setup.dm
 2015-03-30 22:55:24 +02:00
Zuhayr
0c3a18b0b6 Merge pull request #8380 from volas/sanitize_procs 
[DNM] sanitize() and text.dm refactoring
 2015-03-29 00:57:33 +10:30
PsiOmega
827351dda5 Merge remote-tracking branch 'upstream/dev' into Mask2 2015-03-27 14:16:55 +01:00
PsiOmega
1131c76d45 Cult visual network. 
Implementation of a cult visual network, similar to the original camera network.
Includes the "eye" itself and the initial construction of a mob that can control one.
 2015-03-27 14:16:48 +01:00
Zuhayr
c0887333bc Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-03-27 11:13:53 +10:30